From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- dev-perl/Gtk2/Gtk2-1.249.930.ebuild | 6 +++++- dev-perl/Gtk2/Manifest | 3 ++- .../files/Gtk2-1.249.930-skip-pixbuf-test.patch | 24 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch (limited to 'dev-perl/Gtk2') diff --git a/dev-perl/Gtk2/Gtk2-1.249.930.ebuild b/dev-perl/Gtk2/Gtk2-1.249.930.ebuild index 96a0c9b312cf..76bfe9c481b9 100644 --- a/dev-perl/Gtk2/Gtk2-1.249.930.ebuild +++ b/dev-perl/Gtk2/Gtk2-1.249.930.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -32,6 +32,10 @@ BDEPEND="${RDEPEND} test? ( x11-libs/gdk-pixbuf[jpeg] ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.249.930-skip-pixbuf-test.patch +) + src_test() { virtx perl-module_src_test } diff --git a/dev-perl/Gtk2/Manifest b/dev-perl/Gtk2/Manifest index 5a78395a6928..4734d79bb887 100644 --- a/dev-perl/Gtk2/Manifest +++ b/dev-perl/Gtk2/Manifest @@ -1,5 +1,6 @@ +AUX Gtk2-1.249.930-skip-pixbuf-test.patch 921 BLAKE2B faf756d8d1129e3f06785789516c96268d4d09660177b8ae712a0b4718c78238714c5588ee0397de74a14b0214fcf8161053f636dc6777ff711540c492e53485 SHA512 7c1853d9e63680382fd72a635d430b4eb896efda07d48b99fa4ad081003cb488a3be739c40ba5ee74f18b3d8a5e0847f8b6ab13488ec233a99b65d4f38322b0d DIST Gtk2-1.24992.tar.gz 768646 BLAKE2B b2b63c55d9e1f7e19911bd4a6b268bf27d79339aeef9f8db32fe2fa24666a30e298158a81647ee54d8ce9f04e48d14d21a57971e81383c12d92447af877ae714 SHA512 a3d0ac22ce0f356f1a73c6b7d27161f76573b64cfde54e76d751ce8318eda9410e57d905e03b2562b8d31b80d3dba2bd4a8a7980a331bd5ca0c6f75e61e4e6f7 DIST Gtk2-1.24993.tar.gz 766708 BLAKE2B e9286d3feaf3b9493fe6a1c45f5c75a4cd1553a06bc1aedfef1ed25fc9d4d793d4da21911f86112a51478533341b470c5e6ad3cd1913dea863c0557902774843 SHA512 320b10803394b196e0833ab998b854c7e184d6f291657c732a1fddb0c049d01ef192c73e6a095a87b18ff8cb9ac846fcb3682a2dd0c9c86076342e3ca7e55eb5 EBUILD Gtk2-1.249.920.ebuild 707 BLAKE2B 8f5d0cd49994cecf00985b4e663dde45c70c50674860fd3f9f4143507122fa7584550d498665e76a60ba5491002785dd25de6bc2004765d2bff7ee15eb0a04a6 SHA512 89eb54878ca8942ba021a6eb867ab45f5b517d926eed2176cf4b86b1784ba77e504b973467b00750e67b894e3c72fb1b7f270f5c7aaa716929a3bfc0e5d74d83 -EBUILD Gtk2-1.249.930.ebuild 741 BLAKE2B 704ca24cb83a61fd4770d078f18423c07456acaf3bb7b54179a07b58d9445d32a42ab0ecbd5c8687fc78651f840c3316123716282e6dbe36ce3406c7a7394310 SHA512 82aed723edfd800fc6fd892f1dc6ec4a5ebf8564584bf0093efa969cfc851640d17dfc57b8441cd45d0309568ae78261834f539c781251a2550b05004e5d6b93 +EBUILD Gtk2-1.249.930.ebuild 806 BLAKE2B c314df34b2742918fc8cdd0bcb0a96bb36a774e2433f1b1bed37022dd461e496d42f358e084c74cba350b47b69f3f65fd8704a5cfe3eaba9e16e373cb1b5125b SHA512 74c4094f534346c883fb67aa3972e40ba521c872f2c2f37a8de7350fb8c47080624e54d706e72ed8288e5e92dd2f4b3043623c4a404bb12fcc9e0a2bc9ff162b MISC metadata.xml 1290 BLAKE2B df7b90c97d8df33633506548a3fb4097e83c2f40444bbc377a5acc196bf55bbb51a41baeaf5c9129cf6e8edf29acbc46003ab064a22aab26aa7ab432026346ae SHA512 900f11881126eba531dc91bebf71e89a1322b79702b818fe2a0a1312d5613d10d1e061b13e6825e2bd83664258ba028a79237c43a506d3abc1e0ec608a806d77 diff --git a/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch b/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch new file mode 100644 index 000000000000..b64d9470a48e --- /dev/null +++ b/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/774396 +https://git.launchpad.net/ubuntu/+source/libgtk2-perl/tree/debian/patches/new_gdk_pixbuf.patch + +# Description: skip a test that is made invalid by the new gdk-pixbuf +# Upstream: https://gitlab.gnome.org/GNOME/perl-gtk2/issues/3 +# +--- a/t/GdkPixbuf.t ++++ b/t/GdkPixbuf.t +@@ -123,9 +123,12 @@ my $log = Glib::Log->set_handler ('GdkPi + $pixbuf = Gtk2::Gdk::Pixbuf->new_from_xpm_data (@test_xpm[0..2]); + ok (! defined ($pixbuf), "Don't crash on broken pixmap data"); + $pixbuf = Gtk2::Gdk::Pixbuf->new_from_xpm_data (@test_xpm[0..5]); +-ok (defined $pixbuf, "Don't crash on partial pixmap data"); +-Glib::Log->remove_handler ('GdkPixbuf', $log); +- ++SKIP: { ++ skip 'new gdk-pixbuf error out on invalid xpm', 1; ++ ++ ok (defined $pixbuf, "Don't crash on partial pixmap data"); ++ Glib::Log->remove_handler ('GdkPixbuf', $log); ++} + + # raw pixel values to make the xpm above + my $rawdata = pack 'C*', -- cgit v1.2.3