1 |
commit: ba9572d8a260b4c414525efc3e6a37b17000cb96 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 13 06:54:24 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 13 06:54:34 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9572d8 |
7 |
|
8 |
dev-perl/Gtk3: Fix tests with new gdk-pixbuf |
9 |
|
10 |
Closes: https://bugs.gentoo.org/683046 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
13 |
|
14 |
dev-perl/Gtk3/Gtk3-0.34.0.ebuild | 6 +++ |
15 |
.../Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch | 63 ++++++++++++++++++++++ |
16 |
2 files changed, 69 insertions(+) |
17 |
|
18 |
diff --git a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild |
19 |
index a1fe153f352..8243b1786b7 100644 |
20 |
--- a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild |
21 |
+++ b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild |
22 |
@@ -26,6 +26,12 @@ DEPEND="${RDEPEND} |
23 |
>=virtual/perl-Test-Simple-0.960.0 |
24 |
) |
25 |
" |
26 |
+ |
27 |
+PATCHES=( |
28 |
+ # Fixed in next version, bug #683046 |
29 |
+ "${FILESDIR}"/${P}-gdk-pixbuf-test.patch |
30 |
+) |
31 |
+ |
32 |
src_test() { |
33 |
virtx perl-module_src_test |
34 |
} |
35 |
|
36 |
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 |
37 |
new file mode 100644 |
38 |
index 00000000000..48a725f1437 |
39 |
--- /dev/null |
40 |
+++ b/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch |
41 |
@@ -0,0 +1,63 @@ |
42 |
+From 88bc49e7a21da0131b10546aa07ebdf98d18a37e Mon Sep 17 00:00:00 2001 |
43 |
+From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@×××.de> |
44 |
+Date: Sun, 6 Jan 2019 15:18:02 +0100 |
45 |
+Subject: [PATCH] Load GdkPixdata introspection data if gdk-pixbuf >= 2.38.0 |
46 |
+ |
47 |
+In gdk-pixbuf 2.38.0, the GdkPixdata introspection data was split out into its |
48 |
+own file. |
49 |
+ |
50 |
+Based on a patch by gregor herrmann <gregoa@××××××.org>. |
51 |
+ |
52 |
+https://rt.cpan.org/Ticket/Display.html?id=127071 |
53 |
+--- |
54 |
+ lib/Gtk3.pm | 14 ++++++++++++++ |
55 |
+ perl-Gtk3.doap => perl-gtk3.doap | 0 |
56 |
+ 2 files changed, 14 insertions(+) |
57 |
+ rename perl-Gtk3.doap => perl-gtk3.doap (100%) |
58 |
+ |
59 |
+diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm |
60 |
+index 6a65487..f90af7e 100644 |
61 |
+--- a/lib/Gtk3.pm |
62 |
++++ b/lib/Gtk3.pm |
63 |
+@@ -60,6 +60,7 @@ and Perl packages: |
64 |
+ Gtk-3.0 | Gtk3 |
65 |
+ Gdk-3.0 | Gtk3::Gdk |
66 |
+ GdkPixbuf-2.0 | Gtk3::Gdk |
67 |
++ GdkPixdata-2.0| Gtk3::Gdk |
68 |
+ Pango-1.0 | Pango |
69 |
+ |
70 |
+ =cut |
71 |
+@@ -84,6 +85,10 @@ my $_GDK_PIXBUF_BASENAME = 'GdkPixbuf'; |
72 |
+ my $_GDK_PIXBUF_VERSION = '2.0'; |
73 |
+ my $_GDK_PIXBUF_PACKAGE = 'Gtk3::Gdk'; |
74 |
+ |
75 |
++my $_GDK_PIXDATA_BASENAME = 'GdkPixdata'; |
76 |
++my $_GDK_PIXDATA_VERSION = '2.0'; |
77 |
++my $_GDK_PIXDATA_PACKAGE = 'Gtk3::Gdk'; |
78 |
++ |
79 |
+ my $_PANGO_BASENAME = 'Pango'; |
80 |
+ my $_PANGO_VERSION = '1.0'; |
81 |
+ my $_PANGO_PACKAGE = 'Pango'; |
82 |
+@@ -471,6 +476,15 @@ sub import { |
83 |
+ package => $_GDK_PIXBUF_PACKAGE, |
84 |
+ flatten_array_ref_return_for => \@_GDK_PIXBUF_FLATTEN_ARRAY_REF_RETURN_FOR); |
85 |
+ |
86 |
++ # In gdk-pixbuf 2.38.0, the GdkPixdata introspection information was split |
87 |
++ # out into its own file. |
88 |
++ if (Gtk3::Gdk::Pixbuf::CHECK_VERSION (2, 38, 0)) { |
89 |
++ Glib::Object::Introspection->setup ( |
90 |
++ basename => $_GDK_PIXDATA_BASENAME, |
91 |
++ version => $_GDK_PIXDATA_VERSION, |
92 |
++ package => $_GDK_PIXDATA_PACKAGE); |
93 |
++ } |
94 |
++ |
95 |
+ Glib::Object::Introspection->setup ( |
96 |
+ basename => $_PANGO_BASENAME, |
97 |
+ version => $_PANGO_VERSION, |
98 |
+diff --git a/perl-Gtk3.doap b/perl-gtk3.doap |
99 |
+similarity index 100% |
100 |
+rename from perl-Gtk3.doap |
101 |
+rename to perl-gtk3.doap |
102 |
+-- |
103 |
+2.18.1 |
104 |
+ |