summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2019-04-13 08:54:24 +0200
committerPacho Ramos <pacho@gentoo.org>2019-04-13 08:54:34 +0200
commitba9572d8a260b4c414525efc3e6a37b17000cb96 (patch)
tree0ee711ac1bf5e3c57a16126a261ede5351d7646e /dev-perl
parentprofiles/package.mask: mask ruby24-only old rails packages (diff)
downloadgentoo-ba9572d8a260b4c414525efc3e6a37b17000cb96.tar.gz
gentoo-ba9572d8a260b4c414525efc3e6a37b17000cb96.tar.bz2
gentoo-ba9572d8a260b4c414525efc3e6a37b17000cb96.zip
dev-perl/Gtk3: Fix tests with new gdk-pixbuf
Closes: https://bugs.gentoo.org/683046 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'dev-perl')
-rw-r--r--dev-perl/Gtk3/Gtk3-0.34.0.ebuild6
-rw-r--r--dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch63
2 files changed, 69 insertions, 0 deletions
diff --git a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild
index a1fe153f352..8243b1786b7 100644
--- a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild
+++ b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild
@@ -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/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 00000000000..48a725f1437
--- /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?= <kaffeetisch@gmx.de>
+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 <gregoa@debian.org>.
+
+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
+