diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-07 18:01:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-07 18:01:50 +0000 |
| commit | aaac049f1448de5f96cd0d4e2cfef66ea383da46 (patch) | |
| tree | ef557134d1a0fb5abe33752f94c720270f7de325 /app-office | |
| parent | Stable for x86, wrt bug #418501 (diff) | |
| download | gentoo-2-aaac049f1448de5f96cd0d4e2cfef66ea383da46.tar.gz gentoo-2-aaac049f1448de5f96cd0d4e2cfef66ea383da46.tar.bz2 gentoo-2-aaac049f1448de5f96cd0d4e2cfef66ea383da46.zip | |
app-office/scribus: Add patch to match current HEAD, #416681; thanks James Cloos for the patch
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/scribus/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.0-docs.patch | 24 | ||||
| -rw-r--r-- | app-office/scribus/scribus-9999.ebuild | 4 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index 557549bff210..0ac444fd1dd1 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/scribus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.161 2012/05/22 06:29:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.162 2012/06/07 18:01:49 jlec Exp $ + + 07 Jun 2012; Justin Lecher <jlec@gentoo.org> +files/scribus-1.5.0-docs.patch, + scribus-9999.ebuild: + Add patch to match current HEAD, #416681; thanks James Cloos for the patch 22 May 2012; Justin Lecher <jlec@gentoo.org> -scribus-1.3.9.ebuild, -scribus-1.3.9-r2.ebuild, -scribus-1.4.0-r1.ebuild: diff --git a/app-office/scribus/files/scribus-1.5.0-docs.patch b/app-office/scribus/files/scribus-1.5.0-docs.patch new file mode 100644 index 000000000000..8e342cd612f2 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.0-docs.patch @@ -0,0 +1,24 @@ + CMakeLists.txt | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f34048..4880594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") + ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) + IF(NOT WANT_VERSIONING) +- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") ++ SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/") + ELSE(NOT WANT_VERSIONING) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") + ENDIF(NOT WANT_VERSIONING) +@@ -801,7 +801,6 @@ INSTALL(FILES + BUILDING + ChangeLog + ChangeLogSVN +- COPYING + LINKS + NEWS + PACKAGING diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 25f6f356323e..740bfc68c008 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.1 2012/02/13 09:25:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.2 2012/06/07 18:01:49 jlec Exp $ EAPI=4 @@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND} dev-libs/boost" PATCHES=( - "${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch + "${FILESDIR}"/${PN}-1.5.0-docs.patch ) pkg_setup() { |