From 7f7fc258f5d09d73e9e46541d8d6d010a0240f51 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 13 Oct 2019 14:23:17 +0300 Subject: x11-libs/gdk-pixbuf: loaders.cache update fixes (thumbnailing, etc) Fix regressions from meson port for gdk-pixbuf loaders.cache updating. * Add missing gnome2_gdk_pixbuf_savelist call to pkg_preinst for stable version, revbumped straight to stable to fix any outdated caches for stable users, as it could be causing lack of thumbnailing functionality and other issues. * Add it to ~arch version too, but also downgrade it back to EAPI-7, as gnome2-utils.eclass is broken for EAPI-7 still for gdk-pixbuf cache updating (missing eutils inherit from emktemp usage and broken $ED and $EROOT lack of ending slash handling. Though instead of full revert of the changes, convert the ebuilds own $ED and $EROOT handling to be EAPI agnostic for now. * Drop ancient migration log in the ~arch revbump that seems to have been for a time when gdk-pixbuf was newly introduced over a decade or more ago (when split out of gtk2 in its early days). Closes: https://bugs.gentoo.org/697602 Package-Manager: Portage-2.3.69, Repoman-2.3.12 Signed-off-by: Mart Raudsepp --- x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild | 143 ++++++++++++++++++++++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild | 142 ----------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild | 139 +++++++++++++++++++++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild | 143 ------------------------ 4 files changed, 282 insertions(+), 285 deletions(-) create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild (limited to 'x11-libs') diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild new file mode 100644 index 000000000000..e9a368ec3121 --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="X gtk-doc +introspection jpeg tiff" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +COMMON_DEPEND=" + >=dev-libs/glib-2.48.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}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.20 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" +# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise +RDEPEND="${COMMON_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) + -Djasper=false + $(meson_use X x11) + -Dbuiltin_loaders=png + -Drelocatable=false + #native_windows_loaders + -Dinstalled_tests=false + -Dgio_sniffing=true + ) + if multilib_is_native_abi; then + emesonargs+=( + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dman=true + ) + else + emesonargs+=( + -Ddocs=false + -Dgir=false + -Dman=false + ) + fi + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} + +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 + + # Migration snippet for when this was handled by gtk+ + if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" + fi +} + +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 +} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild deleted file mode 100644 index b6c4d2b80182..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -COMMON_DEPEND=" - >=dev-libs/glib-2.48.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}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_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) - -Djasper=false - $(meson_use X x11) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dman=true - ) - else - emesonargs+=( - -Ddocs=false - -Dgir=false - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -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 -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update - - # Migration snippet for when this was handled by gtk+ - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" - fi -} - -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 -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild new file mode 100644 index 000000000000..751e7ed0fff8 --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_* +# TODO: functions and eutils inherit for emktemp or some other solution + +inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="X gtk-doc +introspection jpeg tiff" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +DEPEND=" + >=dev-libs/glib-2.48.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}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise +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) + -Djasper=false + $(meson_use X x11) + -Dbuiltin_loaders=png + -Drelocatable=false + #native_windows_loaders + -Dinstalled_tests=false + -Dgio_sniffing=true + ) + if multilib_is_native_abi; then + emesonargs+=( + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dman=true + ) + else + emesonargs+=( + -Ddocs=false + -Dgir=false + -Dman=false + ) + fi + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} + +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 +} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild deleted file mode 100644 index 59812852fb3a..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.48.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}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -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) - -Djasper=false - $(meson_use X x11) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dman=true - ) - else - emesonargs+=( - -Ddocs=false - -Dgir=false - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -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 -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update - - # Migration snippet for when this was handled by gtk+ - if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" - fi -} - -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 -} -- cgit v1.2.3-65-gdbad