diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /x11-libs/gdk-pixbuf | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'x11-libs/gdk-pixbuf')
-rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 4 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild | 132 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild | 41 |
3 files changed, 16 insertions, 161 deletions
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index fcca38905b52..b244de0b72c1 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,6 +1,4 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d -DIST gdk-pixbuf-2.42.4.tar.xz 7534896 BLAKE2B 87224c13a83848616ef52e65580239fcb4b81ccf2ab9e9cfdb55621c8b2a5b5c97ee152a83cbd1774bf3f868c6ce3779838c72877d2a5aa14d6cafad19f2d022 SHA512 b1eca16719e749d111c33592892ab18e2a1dc5f69a16762860bb54e0c97f535d7049fc388ce9daa025153ff2af56a367d8b164fa4025ee9a0131825a6108f772 DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d -EBUILD gdk-pixbuf-2.42.4.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6 -EBUILD gdk-pixbuf-2.42.6.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6 +EBUILD gdk-pixbuf-2.42.6.ebuild 3467 BLAKE2B e1934dd2c398046a273ae1928f66fb1d6d9dacff34a414529febe94ee286046ab43ca36ca644abc81a45735b7e5fed3d8d705b0056335463f5425c342bbdb975 SHA512 7a4a174301713b54748e54db5ba835af3840e0044b5fbe80c313533c1919e3b217f05ebbb69907e8e659d2e6664f4a9d04c6cc2b22f0f5478c64d31a945f8d4e MISC metadata.xml 331 BLAKE2B 4d198ee50a72d8d34a4cce94c2c7fecccf3fd4918b3100e182bdea1b80132f6773ac7d741ce5d55faef04c22158f8ea6b6ebff10908b8ffcc1f6d1e0caa15837 SHA512 3fe8410456df610566e862c010f9f5a3eb407fb72a842ab22e77d9400c7be98798296d2eab93ab2c97042779c0c5a19df1ad7e6c4ba71f82e17901cefcc4fff4 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild deleted file mode 100644 index 00c3b1618014..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# 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-minimal 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="gtk-doc +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} - !<x11-libs/gtk+-2.90.4:3 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/glib:2 - dev-libs/libxslt - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - >=dev-util/meson-0.55.3 -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -PATCHES=( - # Do not run lowmem test on uclibc - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch -) - -src_prepare() { - xdg_src_prepare - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> 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 - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc gtk_docs) - $(meson_feature introspection) - -Dman=true - ) - else - emesonargs+=( - -Dgtk_doc=false - -Dintrospection=disabled - -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.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild index 00c3b1618014..146867dc375b 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg +inherit gnome.org gnome2-utils meson-multilib multilib xdg DESCRIPTION="Image loading library for GTK+" HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" @@ -30,8 +30,10 @@ BDEPEND=" dev-libs/glib:2 dev-libs/libxslt dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + dev-util/gi-docgen + ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=dev-util/meson-0.55.3 @@ -68,33 +70,20 @@ multilib_src_configure() { #native_windows_loaders -Dinstalled_tests=false -Dgio_sniffing=true + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) + $(meson_native_true man) ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc gtk_docs) - $(meson_feature introspection) - -Dman=true - ) - else - emesonargs+=( - -Dgtk_doc=false - -Dintrospection=disabled - -Dman=false - ) - fi - meson_src_configure -} -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test + meson_src_configure } -multilib_src_install() { - meson_src_install +multilib_src_install_all() { + if use gtk-doc; then + mkdir "${ED}"/usr/share/doc/${PF}/html || die + mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die + mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die + fi } pkg_preinst() { |