diff options
| -rw-r--r-- | app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild index 46321ba50eb7..002dd92be082 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild @@ -89,6 +89,9 @@ src_prepare() { # http://pkgs.fedoraproject.org/cgit/ghostscript.git EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches/" + EPATCH_EXCLUDE=" + ghostscript-gpl-9.12-sys-zlib.patch + " epatch if use djvu ; then @@ -112,6 +115,11 @@ src_prepare() { "${S}"/base/unix-dll.mak || die "sed failed" fi + # Force the include dirs to a neutral location. + sed -i \ + -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + configure.ac || die + # search path fix # put LDFLAGS after BINDIR, bug #383447 sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \ diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild index 13e873ca3d53..2bd0afe9a505 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild @@ -89,9 +89,12 @@ src_prepare() { # http://pkgs.fedoraproject.org/cgit/ghostscript.git EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches/" - EPATCH_EXCLUDE="ghostscript-gpl-8.64-noopt.patch - ghostscript-gpl-9.07-wrf-snprintf.patch - ghostscript-gpl-9.12-icc-missing-check.patch" + EPATCH_EXCLUDE=" + ghostscript-gpl-8.64-noopt.patch + ghostscript-gpl-9.07-wrf-snprintf.patch + ghostscript-gpl-9.12-icc-missing-check.patch + ghostscript-gpl-9.12-sys-zlib.patch + " epatch epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch @@ -117,6 +120,11 @@ src_prepare() { "${S}"/base/unix-dll.mak || die "sed failed" fi + # Force the include dirs to a neutral location. + sed -i \ + -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + configure.ac || die + # search path fix # put LDFLAGS after BINDIR, bug #383447 sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \ |