[libgtk3-perl] 03/04: Drop 0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch: merged upstream.

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository libgtk3-perl.

commit 8732b2978e4b9e9dcbb66a5275addecfb2214725
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Aug 14 11:30:46 2015 +0000

    Drop 0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch: merged upstream.
---
 ...-pixbuf-2.31.3-that-reverted-some-annotat.patch | 80 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 81 deletions(-)

diff --git a/debian/patches/0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch b/debian/patches/0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch
deleted file mode 100644
index 5cc333d..0000000
--- a/debian/patches/0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Sun, 31 May 2015 07:52:49 +0000
-Forwarded: https://mail.gnome.org/archives/gtk-perl-list/2015-May/msg00021.html
-Subject: Support gdk-pixbuf >= 2.31.3,
- that reverted some annotation changes that came with 2.31.2.
-
----
- lib/Gtk3.pm | 38 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 35 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm
-index 64221a0..1a6113a 100644
---- a/lib/Gtk3.pm
-+++ b/lib/Gtk3.pm
-@@ -1431,6 +1431,11 @@ my $HAVE_GDK_PIXBUF_2_31_2 = sub {
-   return (Gtk3::Gdk::PIXBUF_MAJOR () == 2 && Gtk3::Gdk::PIXBUF_MINOR () > 31) ||
-          (Gtk3::Gdk::PIXBUF_MAJOR () == 2 && Gtk3::Gdk::PIXBUF_MINOR () == 31 && Gtk3::Gdk::PIXBUF_MICRO () >= 2);
- };
-+my $HAVE_GDK_PIXBUF_2_31_3 = sub {
-+  return (Gtk3::Gdk::PIXBUF_MAJOR () == 2 && Gtk3::Gdk::PIXBUF_MINOR () > 31) ||
-+         (Gtk3::Gdk::PIXBUF_MAJOR () == 2 && Gtk3::Gdk::PIXBUF_MINOR () == 31 && Gtk3::Gdk::PIXBUF_MICRO () >= 3);
-+};
-+
- 
- sub Gtk3::Gdk::Pixbuf::save {
-   my ($pixbuf, $filename, $type, @rest) = @_;
-@@ -1439,7 +1444,16 @@ sub Gtk3::Gdk::Pixbuf::save {
-     croak ("Usage: \$pixbuf->save (\$filename, \$type, \\\@keys, \\\@values)\n",
-            " -or-: \$pixbuf->save (\$filename, \$type, \$key1 => \$value1, ...)");
-   }
--  my $method = $HAVE_GDK_PIXBUF_2_31_2->() ? 'save' : 'savev';
-+  my $method;
-+  if ($HAVE_GDK_PIXBUF_2_31_3->()) {
-+      $method = 'savev';
-+  }
-+  elsif ($HAVE_GDK_PIXBUF_2_31_2->()) {
-+      $method = 'save';
-+  }
-+  else {
-+      $method = 'savev';
-+  }
-   Glib::Object::Introspection->invoke (
-     $_GDK_PIXBUF_BASENAME, 'Pixbuf', $method,
-     $pixbuf, $filename, $type, $keys, $values);
-@@ -1452,7 +1466,16 @@ sub Gtk3::Gdk::Pixbuf::save_to_buffer {
-     croak ("Usage: \$pixbuf->save_to_buffer (\$type, \\\@keys, \\\@values)\n",
-            " -or-: \$pixbuf->save_to_buffer (\$type, \$key1 => \$value1, ...)");
-   }
--  my $method = $HAVE_GDK_PIXBUF_2_31_2->() ? 'save_to_buffer' : 'save_to_bufferv';
-+  my $method;
-+  if ($HAVE_GDK_PIXBUF_2_31_3->()) {
-+      $method = 'save_to_bufferv';
-+  }
-+  elsif ($HAVE_GDK_PIXBUF_2_31_2->()) {
-+      $method = 'save_to_buffer';
-+  }
-+  else {
-+      $method = 'save_to_bufferv';
-+  }
-   my (undef, $buffer) =
-     Glib::Object::Introspection->invoke (
-       $_GDK_PIXBUF_BASENAME, 'Pixbuf', $method,
-@@ -1467,7 +1490,16 @@ sub Gtk3::Gdk::Pixbuf::save_to_callback {
-     croak ("Usage: \$pixbuf->save_to_callback (\$save_func, \$user_data, \$type, \\\@keys, \\\@values)\n",
-            " -or-: \$pixbuf->save_to_callback (\$save_func, \$user_data, \$type, \$key1 => \$value1, ...)");
-   }
--  my $method = $HAVE_GDK_PIXBUF_2_31_2->() ? 'save_to_callback' : 'save_to_callbackv';
-+  my $method;
-+  if ($HAVE_GDK_PIXBUF_2_31_3->()) {
-+      $method = 'save_to_callbackv';
-+  }
-+  elsif ($HAVE_GDK_PIXBUF_2_31_2->()) {
-+      $method = 'save_to_callback';
-+  }
-+  else {
-+      $method = 'save_to_callbackv';
-+  }
-   Glib::Object::Introspection->invoke (
-     $_GDK_PIXBUF_BASENAME, 'Pixbuf', $method,
-     $pixbuf, $save_func, $user_data, $type, $keys, $values);
diff --git a/debian/patches/series b/debian/patches/series
index 3c1daed..937ee11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Use-a-temporary-directory-as-HOME.patch
-0002-Support-gdk-pixbuf-2.31.3-that-reverted-some-annotat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgtk3-perl.git