diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-04-30 07:45:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-04-30 07:45:10 +0000 |
| commit | 9ad1a5db1103d6b994fea5ae7b15b552425b64e0 (patch) | |
| tree | b177e66dc5096a1af353bbafd1f092d28c71218a /app-office | |
| parent | app-office/scribus: Clean fix for minizip usage, #383833 (diff) | |
| download | historical-9ad1a5db1103d6b994fea5ae7b15b552425b64e0.tar.gz historical-9ad1a5db1103d6b994fea5ae7b15b552425b64e0.tar.bz2 historical-9ad1a5db1103d6b994fea5ae7b15b552425b64e0.zip | |
app-office/scribus: Move changes to live version
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/scribus/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/scribus/Manifest | 10 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.4.9999.ebuild | 19 |
3 files changed, 22 insertions, 12 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index e4a12d37b03a..b146a41415f1 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,9 @@ # 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.154 2012/04/30 07:28:44 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.155 2012/04/30 07:45:10 jlec Exp $ + + 30 Apr 2012; Justin Lecher <jlec@gentoo.org> scribus-1.4.9999.ebuild: + Move changes to live version *scribus-1.4.0-r2 (30 Apr 2012) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index b5b99448657c..7aeb610320e1 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -13,14 +13,14 @@ EBUILD scribus-1.3.9-r2.ebuild 2151 RMD160 8567a07bceaf0e2bfeef124511df946743bac EBUILD scribus-1.3.9.ebuild 1760 RMD160 98f5cdabc0a96a5e2851f310491062d69fad782a SHA1 ddf0cad864308587b1e0e6c4c1711e8dcb2428be SHA256 fca86c8dec51f2cf185702bb0db6aa3ceaa483895d1ac2c200005c33f2492849 EBUILD scribus-1.4.0-r1.ebuild 2905 RMD160 5388c1bb0a684a2460bedadc76ea66c5f60c762f SHA1 96e3aedeb4bab002d298dc386dee0132d287dbd1 SHA256 03b1b59f0620209c232412a3a5bf1cc618ca433910fbd5130a194b65c4aa46c3 EBUILD scribus-1.4.0-r2.ebuild 3137 RMD160 a93500146479b736e99f083cd78234b8374bfd35 SHA1 ed6e29a3872dd8184be682f5d62a161c9817ceda SHA256 3d5d6763a1378ca914c3080985af4878742216a13e24efa020c692cf87d89740 -EBUILD scribus-1.4.9999.ebuild 2969 RMD160 7b1ccc8cdd70ab48d33e4822ee351af96fcd57c1 SHA1 773a0b5cd031afb28543430bfe67b4c11012011c SHA256 38eebca7f224af26e2dfa503f66890c5c81ab1cc22e29d0fbeb546c5162f6faa +EBUILD scribus-1.4.9999.ebuild 3208 RMD160 a5b75972f84e11a393cb6d0faa25023710381ac2 SHA1 3366cbc5d4f4431aeb5384dcd13e7eaf172fe5f9 SHA256 15f7a0e9d47c6b54a8374940a0fcd78d1e2957fe971ed79ead34acb3c130c9ad EBUILD scribus-9999.ebuild 2951 RMD160 77bd6e3b2e46b0dce5033678e6e228f968f1b08a SHA1 c4ff832ca4cd0fa4a70e0e62fa0a9c9a53cf3487 SHA256 86971283dc370b8b35fff58c79fbddd8b60a4418fff40faea03014ac40300855 -MISC ChangeLog 20046 RMD160 e0c22f4d8a14e6a6bebba86d0209274533a20b8c SHA1 1aa1edaddec59a3bccdfef8ecf65c2f8d046dcaa SHA256 d59e452ccb610a36bf83265b6cdc2da4537c2f6c2618576676d6528fc1ad6ed6 +MISC ChangeLog 20150 RMD160 3befd84ab390a463d2c803420c05659dc00b35c6 SHA1 8c5b26696c2b2af40c2c06c5766f6da523bfade6 SHA256 15876ef8fab4b1fa02252d6e819917312a3f639b9f49bcac49b4b3ef6778bf91 MISC metadata.xml 1137 RMD160 00e3b693f409e0d90ee575f294c3caa1cbcc2b22 SHA1 8b7b7aef6154e329325efd40da2c22b7c099c513 SHA256 794d317abd9329bff636e333c582e7fd79a8f4cccfe8d606d960eb2aebb22ccc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAk+ePzIACgkQgAnW8HDreRbZ6gCdH9wGzNBHIZDIjsizpw+UBgPz -Zt8An2NY9ArmGrXS7ZA/Q8vQdDNEeRhP -=a5Ey +iEYEAREKAAYFAk+eQwsACgkQgAnW8HDreRbXOwCeLbkbdov8CAb7VtYEmxBC9qU3 +Jv0AnjcIGEEE8uD+HgW/kv/NobJlbP9c +=LWAU -----END PGP SIGNATURE----- diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild index 1e12dde6cc88..1d38ab33717e 100644 --- a/app-office/scribus/scribus-1.4.9999.ebuild +++ b/app-office/scribus/scribus-1.4.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-1.4.9999.ebuild,v 1.1 2012/02/13 10:55:47 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.2 2012/04/30 07:45:10 jlec Exp $ EAPI=4 @@ -32,7 +32,7 @@ COMMON_DEPEND=" media-libs/libpng:0 media-libs/tiff:0 net-print/cups - sys-libs/zlib + sys-libs/zlib[minizip] x11-libs/qt-core:4 x11-libs/qt-gui:4 virtual/jpeg @@ -46,6 +46,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch + "${FILESDIR}"/${PN}-1.4.0-minizip.patch ) pkg_setup() { @@ -54,6 +55,16 @@ pkg_setup() { } src_prepare() { + cat > cmake/modules/FindZLIB.cmake <<- EOF + find_package(PkgConfig) + pkg_check_modules(ZLIB minizip zlib) + SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) + SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) + MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) + EOF + + rm scribus/{ioapi,unzip}.[ch] || die + if use templates; then sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die fi @@ -61,10 +72,6 @@ src_prepare() { sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die fi - sed \ - -e '1i#define OF(x) x' \ - -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die - base_src_prepare subversion_src_prepare } |