This is an automated email from the git hooks/post-receive script. intrigeri pushed a commit to annotated tag debian/2%1.2497-1 in repository libgtk2-perl.
commit 33b4f9a8a862bf5a0ae3f2f969356add6795a565 Author: intrigeri <intrig...@boum.org> Date: Wed Dec 30 10:17:51 2015 +0000 Drop previously cherry-picked Fix-a-test-failure-in-t-GdkWindow.t.patch: it's part of the new upstream release. --- .../Fix-a-test-failure-in-t-GdkWindow.t.patch | 37 ---------------------- debian/patches/series | 1 - 2 files changed, 38 deletions(-) diff --git a/debian/patches/Fix-a-test-failure-in-t-GdkWindow.t.patch b/debian/patches/Fix-a-test-failure-in-t-GdkWindow.t.patch deleted file mode 100644 index 10ee2b9..0000000 --- a/debian/patches/Fix-a-test-failure-in-t-GdkWindow.t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?utf-8?q?Torsten_Sch=C3=B6nfeld?= <kaffeeti...@gmx.de> -Date: Fri, 14 Aug 2015 23:37:46 +0200 -Origin: upstream, https://git.gnome.org/browse/perl-Gtk2/commit/?id=a81b70d65885123f9cdbbe78f06daec25897e62a -Forwarded: not-needed -Subject: Fix a test failure in t/GdkWindow.t - -It occurs only on gtk+ >= 2.24.26 and < 2.24.29. ---- - t/GdkWindow.t | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/t/GdkWindow.t b/t/GdkWindow.t -index e65931b..0bfca32 100644 ---- a/t/GdkWindow.t -+++ b/t/GdkWindow.t -@@ -191,9 +191,19 @@ $window -> shape_combine_region($region, 1, 1); - $window -> shape_combine_mask(undef, 0, 0); - $window -> shape_combine_region(undef, 0, 0); - -+SKIP: { -+ skip 'child shapes functions trigger a bug', 0 -+ if (Gtk2->CHECK_VERSION (2, 24, 26) && !Gtk2->CHECK_VERSION (2, 24, 29)); -+ -+ # Introduced in -+ # <https://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=aff976ef0dad471edc35d65b9d1b5ba97da1698e>, -+ # fixed in -+ # <https://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=7ee8b1fd9af52842e87c26465b9aa8921e62ec90>. -+ -+ $window -> set_child_shapes(); -+ $window -> merge_child_shapes(); -+} - --$window -> set_child_shapes(); --$window -> merge_child_shapes(); - $window -> set_static_gravities(0); # FIXME: check retval? - $window -> set_title("Blub"); - $window -> set_background(Gtk2::Gdk::Color -> new(255, 255, 255)); diff --git a/debian/patches/series b/debian/patches/series index 16e3859..b9db011 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 30-disable_libgtk_version_check.patch fix-typo.patch -Fix-a-test-failure-in-t-GdkWindow.t.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