From 3c0ac23fc220e56b44356d845aaf1b71df69c816 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 19:07:46 +0100 Subject: gentoo resync : 21.07.2018 --- net-print/Manifest.gz | Bin 6918 -> 6919 bytes net-print/cups-filters/Manifest | 5 +- net-print/cups-filters/cups-filters-1.20.3.ebuild | 137 --------------------- net-print/cups-filters/cups-filters-1.20.4.ebuild | 4 + .../files/cups-filters-1.20.4-poppler-0.67.0.patch | 28 +++++ 5 files changed, 34 insertions(+), 140 deletions(-) delete mode 100644 net-print/cups-filters/cups-filters-1.20.3.ebuild create mode 100644 net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 1cae65ec106e..31c09f0bd3bb 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 76bfe9d2e26c..62d37f827a4b 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,11 +1,10 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 +AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535a6a7fc83ed8d5657e71fda0fb402da5f562b60c9810675251d70c12b8a2652038c5685e10efc1b9bb6b6a422ce0008ac1da40a829 SHA512 0c3e5857e90ed959df97b658cae43e17c5f943b88b6a86bdcd9a4d44f2a684810d8e317ad53d61dbca4802f2a45e2f783b527400d3c0f039ff2264d6f92df676 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30 -DIST cups-filters-1.20.3.tar.xz 1469468 BLAKE2B 4b76c751264cc87aaa4fed237ad577433ca2c5bb9f23d572466f0d81f3cd7ee4c78eb783269923603010f4edbf246353017e57ccdc75207855de9ae5f0fc5d4b SHA512 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31 DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07 EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a -EBUILD cups-filters-1.20.3.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a -EBUILD cups-filters-1.20.4.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a +EBUILD cups-filters-1.20.4.ebuild 3566 BLAKE2B 707b47517505e6a359c5e4030ca80abcea579d307870785fef2bc7ca9c29de08fc605580f34b95d8392c900ed7ebc69822f46b4a2e3f0eb2991c4a488e7ed0cb SHA512 96aa7b19a197046ebacb0492ed86863abbdf1388c2df1ed75dc625d76b5dce400495630234e0ee5e893517f47c80a12e8fd66ff338d0da7e44942ab20b23fba7 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a diff --git a/net-print/cups-filters/cups-filters-1.20.3.ebuild b/net-print/cups-filters/cups-filters-1.20.3.ebuild deleted file mode 100644 index be4ec7dfe0fa..000000000000 --- a/net-print/cups-filters/cups-filters-1.20.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -inherit perl-module systemd flag-o-matic - -if [[ "${PV}" == "9999" ]] ; then - inherit bzr autotools - EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" -fi -DESCRIPTION="Cups filters" -HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" - -RDEPEND=" - >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] - >=app-text/qpdf-3.0.2:= - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >=net-print/cups-1.7.3 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - dbus? ( sys-apps/dbus ) - foomatic? ( !net-print/foomatic-filters ) - jpeg? ( virtual/jpeg:0 ) - ldap? ( net-nds/openldap ) - pclm? ( >=app-text/qpdf-7.0_beta1 ) - pdf? ( app-text/mupdf ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - tiff? ( media-libs/tiff:0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - test? ( media-fonts/dejavu ) -" - -src_prepare() { - default - [[ "${PV}" == "9999" ]] && eautoreconf - - # Bug #626800 - append-cxxflags -std=c++11 -} - -src_configure() { - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --enable-imagefilters - --localstatedir="${EPREFIX}"/var - --with-browseremoteprotocols=DNSSD,CUPS - --with-cups-rundir="${EPREFIX}"/run/cups - --with-fontdir="fonts/conf.avail" - --with-pdftops=pdftops - --with-rcdir=no - --without-php - $(use_enable dbus) - $(use_enable foomatic) - $(use_enable ipp_autosetup auto-setup-driverless) - $(use_enable ldap) - $(use_enable pclm) - $(use_enable pdf mutool) - $(use_enable postscript ghostscript) - $(use_enable postscript ijs) - $(use_enable static-libs static) - $(use_enable zeroconf avahi) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_configure - perl-module_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_install - perl_delete_localpod - popd > /dev/null - fi - - if use postscript; then - # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 - dosym gstoraster /usr/libexec/cups/filter/pstoraster - dosym gstopxl /usr/libexec/cups/filter/pstopxl - fi - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die - - cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die - - if ! use zeroconf ; then - sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die - sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die - fi - - doinitd "${T}"/cups-browsed - systemd_dounit "${S}/utils/cups-browsed.service" -} - -src_test() { - emake check -} - -pkg_postinst() { - if ! use foomatic ; then - ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." - ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." - fi -} diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild index be4ec7dfe0fa..4774200f0269 100644 --- a/net-print/cups-filters/cups-filters-1.20.4.ebuild +++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild @@ -49,6 +49,10 @@ DEPEND="${RDEPEND} test? ( media-fonts/dejavu ) " +PATCHES=( + "${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch" +) + src_prepare() { default [[ "${PV}" == "9999" ]] && eautoreconf diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch new file mode 100644 index 000000000000..69376e1c84d2 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch @@ -0,0 +1,28 @@ +From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 20 Jul 2018 15:20:11 +0200 +Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0 + +This only fails with >=poppler-0.67.0 but the change to const was done +in 0.64.0 +--- + filter/pdf.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/filter/pdf.cxx b/filter/pdf.cxx +index 206ccf88..665eab09 100644 +--- a/filter/pdf.cxx ++++ b/filter/pdf.cxx +@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt) + } + + FormField *ff = fm_text->getField(); ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64 ++ const ++#endif + GooString *field_name; + field_name = ff->getFullyQualifiedName(); + if ( ! field_name ) +-- +2.18.0 + -- cgit v1.2.3