From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF240158086 for ; Sun, 12 Dec 2021 17:29:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF8EF2BC01A; Sun, 12 Dec 2021 17:29:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9122B2BC01A for ; Sun, 12 Dec 2021 17:29:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B265A343258 for ; Sun, 12 Dec 2021 17:29:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0DEB1FA for ; Sun, 12 Dec 2021 17:29:53 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1639330074.60cc119b996d4df79b54107afb84356bc60971ea.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild X-VCS-Directories: x11-libs/gdk-pixbuf/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 60cc119b996d4df79b54107afb84356bc60971ea X-VCS-Branch: master Date: Sun, 12 Dec 2021 17:29:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b682569-588c-455a-b1ea-5755e71a69b2 X-Archives-Hash: dbececb5676727739387c97c2dea5eb4 commit: 60cc119b996d4df79b54107afb84356bc60971ea Author: Mart Raudsepp gentoo org> AuthorDate: Sun Dec 12 17:24:37 2021 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Dec 12 17:27:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60cc119b x11-libs/gdk-pixbuf: rework gtk-doc handling, use builtin jpeg, etc * gdk-pixbuf contains pregenerated gtk-docs, so just install those to the place where our devhelp will actually find them too * Build jpeg support into gdk-pixbuf instead of a module, as upstream has started doing so by default as well. With USE=-jpeg it'll work as needed, as it's not part of enabled loaders then * Add missing einstalldocs for NEWS and co * Always depend on docbook-xml-dtd, as needed for manpage generation * Drop old meson minimum requirement as meson.eclass requires much newer by now Closes: https://bugs.gentoo.org/809794 Closes: https://bugs.gentoo.org/811201 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp gentoo.org> x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild | 116 ++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild new file mode 100644 index 000000000000..d8033cb745e8 --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson-multilib multilib xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+introspection jpeg tiff" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +DEPEND=" + >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + ! libpng15 upgrade + # See upstream bug #667068 + # First check that the pattern is present, to catch upstream changes on bumps, + # because sed doesn't return failure code if it doesn't do any replacements + grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" + sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + -Dpng=true + $(meson_use tiff) + $(meson_use jpeg) + -Dbuiltin_loaders=png,jpeg + -Drelocatable=false + #native_windows_loaders + -Dinstalled_tests=false + -Dgio_sniffing=true + -Dgtk_doc=false + $(meson_native_use_feature introspection) + $(meson_native_true man) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + insinto /usr/share/gtk-doc/html + doins -r "${S}"/docs/gdk-pixbuf + doins -r "${S}"/docs/gdk-pixdata +} + +pkg_preinst() { + xdg_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}/${cache} ]]; then + cp "${EROOT}"/${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst + gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + + xdg_pkg_postinst + multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +}