From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- dev-perl/Gtk3/Gtk3-0.34.0.ebuild | 10 +++- dev-perl/Gtk3/Manifest | 3 +- .../Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch | 63 ++++++++++++++++++++++ 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch (limited to 'dev-perl/Gtk3') diff --git a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild index db33ceb58135..8243b1786b75 100644 --- a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild +++ b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit perl-module virtualx DESCRIPTION="Perl interface to the 3.x series of the gtk+ toolkit" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="test" RDEPEND=" @@ -26,6 +26,12 @@ DEPEND="${RDEPEND} >=virtual/perl-Test-Simple-0.960.0 ) " + +PATCHES=( + # Fixed in next version, bug #683046 + "${FILESDIR}"/${P}-gdk-pixbuf-test.patch +) + src_test() { virtx perl-module_src_test } diff --git a/dev-perl/Gtk3/Manifest b/dev-perl/Gtk3/Manifest index 023101bd8bc8..43c4e122d7b5 100644 --- a/dev-perl/Gtk3/Manifest +++ b/dev-perl/Gtk3/Manifest @@ -1,3 +1,4 @@ +AUX Gtk3-0.34.0-gdk-pixbuf-test.patch 1992 BLAKE2B 3f81159c626971f91ce4272ac7e89b693b6d11c430950e48bb24f9b581b2a485a562f5f5170ef44f3b26bf45c7e2b8090307bee2556dbf72fb9e569113875d0f SHA512 ee2864b036a5463df4c821c3a424a62411954e9799be485076013ff1f36b0dd19b678cbb9a7ea1bc3d5365a15986958241b15b8e4009ec91392e0401e234049a DIST Gtk3-0.034.tar.gz 56327 BLAKE2B 338e80954d210c79ece7db48cd421bbedab1ea9b005aa70425b42d794e226208349624c4484f0ab943ffb0ab1a1686dd5ae5d7f9c90157a272f4aa92a6c268b3 SHA512 2102a64091d288a7d89bdbfd9cd08b3a9ec5ac2c1276fdf49fb756c182223ba1951152d89bc0f448893d8401ca9f4db57c3d3a2271b3aa82eb1e9ff63cf3cf9e -EBUILD Gtk3-0.34.0.ebuild 627 BLAKE2B 9b5d44478d83f51eb30533bcba9633be4ed8cc99fb59616d506d5a4454332f04a6ec7555bcc920189517597bf4da5463a8f16bfa0a36794a53e80aa5b60296fc SHA512 8f50dd98f8d4ba7e15d22c19af334e5db83c43fc0291604fc6706e060a2765f31a7fc5bcf271d383bb6e2fc42a1c082ac9f4175a265c68f51fe493debf78254a +EBUILD Gtk3-0.34.0.ebuild 720 BLAKE2B f47214e149b2ae8bb98843b215e2c07cee52c1c739992e12eb9d653b437ca13990514389a81b13f30d456443ac2a85e619f26ff6222683b316d1089cd62a4a08 SHA512 4c68481414208348eb099216f2d67df2152014fe7b30be74f7c223bbc95e16ff7aa69f285e068e1cf03af1f3ac0309545d14bfa60251b2dbc5dfe613938997a8 MISC metadata.xml 446 BLAKE2B 08890607349229f01a933a55328fde3124c66ccc04048f5eca5aaa2462d19ddff80f847725776fce3d9ea091698036c9b1e3b1417fc30c793b88e06da9b653ba SHA512 167e690fa554eebaa685050ae5200d4be0141c5c387440d4a0d101ca9f89a2257885fe7afed49cff8ce90f5a387b3c8fa441d2c7a4bd17f46ae30335e41469d1 diff --git a/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch b/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch new file mode 100644 index 000000000000..48a725f1437a --- /dev/null +++ b/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch @@ -0,0 +1,63 @@ +From 88bc49e7a21da0131b10546aa07ebdf98d18a37e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= +Date: Sun, 6 Jan 2019 15:18:02 +0100 +Subject: [PATCH] Load GdkPixdata introspection data if gdk-pixbuf >= 2.38.0 + +In gdk-pixbuf 2.38.0, the GdkPixdata introspection data was split out into its +own file. + +Based on a patch by gregor herrmann . + +https://rt.cpan.org/Ticket/Display.html?id=127071 +--- + lib/Gtk3.pm | 14 ++++++++++++++ + perl-Gtk3.doap => perl-gtk3.doap | 0 + 2 files changed, 14 insertions(+) + rename perl-Gtk3.doap => perl-gtk3.doap (100%) + +diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm +index 6a65487..f90af7e 100644 +--- a/lib/Gtk3.pm ++++ b/lib/Gtk3.pm +@@ -60,6 +60,7 @@ and Perl packages: + Gtk-3.0 | Gtk3 + Gdk-3.0 | Gtk3::Gdk + GdkPixbuf-2.0 | Gtk3::Gdk ++ GdkPixdata-2.0| Gtk3::Gdk + Pango-1.0 | Pango + + =cut +@@ -84,6 +85,10 @@ my $_GDK_PIXBUF_BASENAME = 'GdkPixbuf'; + my $_GDK_PIXBUF_VERSION = '2.0'; + my $_GDK_PIXBUF_PACKAGE = 'Gtk3::Gdk'; + ++my $_GDK_PIXDATA_BASENAME = 'GdkPixdata'; ++my $_GDK_PIXDATA_VERSION = '2.0'; ++my $_GDK_PIXDATA_PACKAGE = 'Gtk3::Gdk'; ++ + my $_PANGO_BASENAME = 'Pango'; + my $_PANGO_VERSION = '1.0'; + my $_PANGO_PACKAGE = 'Pango'; +@@ -471,6 +476,15 @@ sub import { + package => $_GDK_PIXBUF_PACKAGE, + flatten_array_ref_return_for => \@_GDK_PIXBUF_FLATTEN_ARRAY_REF_RETURN_FOR); + ++ # In gdk-pixbuf 2.38.0, the GdkPixdata introspection information was split ++ # out into its own file. ++ if (Gtk3::Gdk::Pixbuf::CHECK_VERSION (2, 38, 0)) { ++ Glib::Object::Introspection->setup ( ++ basename => $_GDK_PIXDATA_BASENAME, ++ version => $_GDK_PIXDATA_VERSION, ++ package => $_GDK_PIXDATA_PACKAGE); ++ } ++ + Glib::Object::Introspection->setup ( + basename => $_PANGO_BASENAME, + version => $_PANGO_VERSION, +diff --git a/perl-Gtk3.doap b/perl-gtk3.doap +similarity index 100% +rename from perl-Gtk3.doap +rename to perl-gtk3.doap +-- +2.18.1 + -- cgit v1.2.3