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 | 9cdbf69bde3c9c1dd62ef5b88402bcec0b35a1c1 (patch) | |
| tree | cb724581dcbd11c7d41b2702d04ac2c4119e3def /app-office/scribus/scribus-1.4.9999.ebuild | |
| parent | app-office/scribus: Clean fix for minizip usage, #383833 (diff) | |
| download | gentoo-2-9cdbf69bde3c9c1dd62ef5b88402bcec0b35a1c1.tar.gz gentoo-2-9cdbf69bde3c9c1dd62ef5b88402bcec0b35a1c1.tar.bz2 gentoo-2-9cdbf69bde3c9c1dd62ef5b88402bcec0b35a1c1.zip | |
app-office/scribus: Move changes to live version
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office/scribus/scribus-1.4.9999.ebuild')
| -rw-r--r-- | app-office/scribus/scribus-1.4.9999.ebuild | 19 |
1 files changed, 13 insertions, 6 deletions
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 } |