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

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

commit 2334038afd7f5138a79e9c1e8f08f5206578c8ec
Author: intrigeri <intrig...@boum.org>
Date:   Sun Apr 26 09:13:31 2015 +0000

    Drop Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch 
(applied upstream).
    
    This reverts commit 32bb7445c7282952f1537f71085987f571c9b708.
---
 ...nagement-in-Gtk2-Gdk-Display-list_devices.patch | 47 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 48 deletions(-)

diff --git 
a/debian/patches/Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch
 
b/debian/patches/Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch
deleted file mode 100644
index 6640c67..0000000
--- 
a/debian/patches/Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Torsten Schönfeld <kaffeeti...@gmx.de>
-Date: Sat, 17 Jan 2015 14:59:24 +0100
-Origin: 
https://git.gnome.org/browse/perl-Gtk2/commit/?id=4856da628ce37099b27b66a88141dc6daad693b0
-Applied-Upstream: 1.2495
-Subject: Fix incorrect memory management in Gtk2::Gdk::Display::list_devices
-
-We do not own the returned list.
----
- t/GdkDisplay.t   | 4 +++-
- xs/GdkDisplay.xs | 2 --
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/t/GdkDisplay.t b/t/GdkDisplay.t
-index d290446..f4aef59 100644
---- a/t/GdkDisplay.t
-+++ b/t/GdkDisplay.t
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- use strict;
- use Gtk2::TestHelper
--  tests => 26,
-+  tests => 27,
-   at_least_version => [2, 2, 0, "GdkDisplay is new in 2.2"];
- 
- # $Id$
-@@ -32,6 +32,8 @@ ok(!$display -> pointer_is_grabbed());
- # $display -> beep();
- $display -> sync();
- 
-+# Do this twice to ensure we did not damage the list.
-+isa_ok(($display -> list_devices())[0], "Gtk2::Gdk::Device");
- isa_ok(($display -> list_devices())[0], "Gtk2::Gdk::Device");
- 
- $display -> put_event(Gtk2::Gdk::Event -> new("button-press"));
-diff --git a/xs/GdkDisplay.xs b/xs/GdkDisplay.xs
-index f558f1d..a019eee 100644
---- a/xs/GdkDisplay.xs
-+++ b/xs/GdkDisplay.xs
-@@ -69,8 +69,6 @@ gdk_display_list_devices (display)
-       devices = gdk_display_list_devices (display);
-       for (i = devices ; i != NULL ; i = i->next)
-               XPUSHs (sv_2mortal (newSVGdkDevice (i->data)));
--      g_list_free (devices);
--      
- 
- GdkEvent* gdk_display_get_event (GdkDisplay *display) 
- 
diff --git a/debian/patches/series b/debian/patches/series
index fcefc39..cb81cee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 Make_t_GtkCellRenderer.t_more_robust.patch
 30-disable_libgtk_version_check.patch
 fix-typo.patch
-Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to