commit: c208708a5fde705ea6604a30fda08c79fba957da Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 23 05:04:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 23 05:09:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c208708a
net-print/libppd: drop 2.0.0, 2.1_beta1 Bug: https://bugs.gentoo.org/940314 Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/libppd/Manifest | 2 +- net-print/libppd/files/libppd-2.0.0-slibtool.patch | 64 ---------------------- net-print/libppd/libppd-2.0.0.ebuild | 63 --------------------- net-print/libppd/libppd-2.1_beta1.ebuild | 61 --------------------- 4 files changed, 1 insertion(+), 189 deletions(-) diff --git a/net-print/libppd/Manifest b/net-print/libppd/Manifest index 320b7f82e169..2d9bc8b1d3be 100644 --- a/net-print/libppd/Manifest +++ b/net-print/libppd/Manifest @@ -1,3 +1,3 @@ -DIST libppd-2.0.0.tar.xz 580716 BLAKE2B 8505c5ab5b515104308624a8f78505343b894df08ab8ac2727d7bd82d0d65d256d22ecaf384b212d9a5c45d2a619a6311722a8c5ed954b7a8a9780477aedb458 SHA512 8be9e67552528606fd804ba13b05710938ed7d02316c1c902ee657bc0e5fade663ffacb5b032609a1c1fdc80d976e7e54d2ca2f71db83cb8fdcee6a371e6bad4 DIST libppd-2.1.0.tar.xz 585288 BLAKE2B 87d325a659b98e2f489673fd2eb78daec83eafee990008380d852be17fbd990e4daa4a16bd5dc1e3a562040595b858c90d0747d815db0fb97fdccf97a3d4aa49 SHA512 06daf9149910298b2acd103c58f8bd345180219e42fab7dbc162b8370492e28b7bcecc6d72192fc8d053ec245a270d1901812662dd50687ff5b327a40ac0f475 +DIST libppd-2.1.1.tar.xz 585776 BLAKE2B 7d2279d61948abf516fb33022ac750efc877a34b0c1e12351f0f2a2b0302abc7bb0c287bff4887874a3f59d7eb84369d5b9cc9c59f83c4a4936976d3898c40db SHA512 b469a94d090f49776486c8b5570bd40d964ea493b81fc404c23e88f18cfdaef2bbddcdf5123c243d9284fa254eec727e6ea4003075386f8f70c3f9145307458b DIST libppd-2.1b1.tar.xz 583692 BLAKE2B f9889ba7758097d2f794b16bdd74758223036daa8e49b191d07789e36ad7e2d69693c9ebb0b89c1c52f23f90fee8b56e1532246da90b1898caf1c557a416c20c SHA512 2b1ab3444f9de4a856f116aae83fd2aaa61adec9862bdd6dcff5fe2672e593b1e69e4da3638994ac4762dcc0e2640c5e3cbf3af247017d3790f01ef10395f54a diff --git a/net-print/libppd/files/libppd-2.0.0-slibtool.patch b/net-print/libppd/files/libppd-2.0.0-slibtool.patch deleted file mode 100644 index 5491ac1fd896..000000000000 --- a/net-print/libppd/files/libppd-2.0.0-slibtool.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://github.com/OpenPrinting/libppd/pull/32 -https://github.com/OpenPrinting/libppd/commit/a040f26f3ca103c8ae7706d91ae157dca0974c49 - -From e614c21b82a2f85487fe406a8bf4a2c9064501f8 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <[email protected]> -Date: Mon, 18 Dec 2023 22:28:21 -0500 -Subject: [PATCH] build: fix failure to correctly link to zlib - -Checking for the header is NOT sufficient when utilizing its shared -library symbols. Look it up with pkg-config explicitly, and explicitly -add it to ensure that at runtime, libppd has its own DT_NEEDED -dependency on libz.so; if libppd successfully links at all -- not a -given, if -Wl,-no-undefined is used -- then it *may* transitively get -libz.so from its recursive dependencies, but this is no guarantee at -all. - -Fixes failure to build discovered at https://bugs.gentoo.org/920273 ---- - Makefile.am | 2 ++ - configure.ac | 8 +++++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7aed422b..c44aa3e0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -120,9 +120,11 @@ libppd_la_SOURCES = \ - $(pkgppddefs_DATA) - libppd_la_LIBADD = \ - $(LIBCUPSFILTERS_LIBS) \ -+ $(ZLIB_LIBS) \ - $(CUPS_LIBS) - libppd_la_CFLAGS = \ - $(LIBCUPSFILTERS_CFLAGS) \ -+ $(ZLIB_CFLAGS) \ - $(CUPS_CFLAGS) - libppd_la_CXXFLAGS = \ - $(libppd_la_CFLAGS) -diff --git a/configure.ac b/configure.ac -index 66927d80..7d8a459b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -164,6 +164,13 @@ AC_SUBST(CUPS_STATEDIR) - # ======================== - PKG_CHECK_MODULES([LIBCUPSFILTERS], [libcupsfilters]) - -+# ============== -+# Check for zlib -+# ============== -+PKG_CHECK_MODULES([ZLIB], [zlib], ,[ -+ AC_CHECK_HEADER([zlib.h]) -+ AC_CHECK_LIB([z], [deflateInit])]) -+ - # ============================================================ - # Check for whether we want to install the testppdfile utility - # ============================================================ -@@ -220,7 +227,6 @@ AC_CHECK_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([sys/stat.h]) - AC_CHECK_HEADERS([sys/types.h]) - AC_CHECK_HEADERS([unistd.h]) --AC_CHECK_HEADERS([zlib.h]) - AC_CHECK_HEADERS([endian.h]) - AC_CHECK_HEADERS([dirent.h]) - AC_CHECK_HEADERS([sys/ioctl.h]) diff --git a/net-print/libppd/libppd-2.0.0.ebuild b/net-print/libppd/libppd-2.0.0.ebuild deleted file mode 100644 index dff811230b6f..000000000000 --- a/net-print/libppd/libppd-2.0.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Legacy library for PPD files, split out of cups-filters" -HOMEPAGE="https://github.com/OpenPrinting/libppd"; -SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+postscript +poppler" -KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86" - -# pdftops has various possible implementations, but the default -# really needs to be decent -REQUIRED_USE="|| ( postscript poppler )" - -RDEPEND=" - >=net-print/cups-2 - net-print/libcupsfilters - !<net-print/cups-filters-2.0.0 - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - poppler? ( >=app-text/poppler-0.32[utils] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-slibtool.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --with-cups-rundir="${EPREFIX}"/run/cups - # This does build time checks for (preferred) tool interfaces. - $(use_enable postscript ghostscript) - $(use_enable poppler pdftops) - # These fallbacks are just probed for the path. Always enable them. - --with-mutool-path="${EPREFIX}"/usr/bin/mutool - --with-pdftocairo-path="${EPREFIX}"/usr/bin/pdftocairo # from poppler - # unpackaged - --disable-acroread - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-print/libppd/libppd-2.1_beta1.ebuild b/net-print/libppd/libppd-2.1_beta1.ebuild deleted file mode 100644 index 577c98a38e63..000000000000 --- a/net-print/libppd/libppd-2.1_beta1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool - -DESCRIPTION="Legacy library for PPD files, split out of cups-filters" -HOMEPAGE="https://github.com/OpenPrinting/libppd"; -SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV/_beta/b}/${P/_beta/b}.tar.xz"; -S="${WORKDIR}"/${P/_beta/b} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+postscript +poppler" - -# pdftops has various possible implementations, but the default -# really needs to be decent -REQUIRED_USE="|| ( postscript poppler )" - -RDEPEND=" - >=net-print/cups-2 - net-print/libcupsfilters - !<net-print/cups-filters-2.0.0 - sys-libs/zlib - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - poppler? ( >=app-text/poppler-0.32[utils] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -src_prepare() { - default - elibtoolize -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --with-cups-rundir="${EPREFIX}"/run/cups - # This does build time checks for (preferred) tool interfaces. - $(use_enable postscript ghostscript) - $(use_enable poppler pdftops) - # These fallbacks are just probed for the path. Always enable them. - --with-mutool-path="${EPREFIX}"/usr/bin/mutool - --with-pdftocairo-path="${EPREFIX}"/usr/bin/pdftocairo # from poppler - # unpackaged - --disable-acroread - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -}
