r54219 - in /trunk/libgtk2-perl/debian: changelog patches/git-fix-gtkassistant.patch patches/git-fix-gtkbuildable.patch patches/series

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Mar 13 17:32:03 2010
New Revision: 54219

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54219
Log:
New patches git-fix-gtkassistant.patch and git-fix-gtkbuildable.patch:
upstream git changes to fix build issues on gtk 2.19; thanks to Sebastien
Bacher for forwarding these patches from Ubuntu to us (closes: #573564).

Added:
    trunk/libgtk2-perl/debian/patches/git-fix-gtkassistant.patch
    trunk/libgtk2-perl/debian/patches/git-fix-gtkbuildable.patch
Modified:
    trunk/libgtk2-perl/debian/changelog
    trunk/libgtk2-perl/debian/patches/series

Modified: trunk/libgtk2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/changelog?rev=54219&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/changelog (original)
+++ trunk/libgtk2-perl/debian/changelog Sat Mar 13 17:32:03 2010
@@ -1,3 +1,11 @@
+libgtk2-perl (1:1.221-5) UNRELEASED; urgency=low
+
+  * New patches git-fix-gtkassistant.patch and git-fix-gtkbuildable.patch:
+    upstream git changes to fix build issues on gtk 2.19; thanks to Sebastien
+    Bacher for forwarding these patches from Ubuntu to us (closes: #573564).
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 13 Mar 2010 18:15:20 +0100
+
 libgtk2-perl (1:1.221-4) unstable; urgency=low
 
   [ Ryan Niebur ]

Added: trunk/libgtk2-perl/debian/patches/git-fix-gtkassistant.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/git-fix-gtkassistant.patch?rev=54219&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/git-fix-gtkassistant.patch (added)
+++ trunk/libgtk2-perl/debian/patches/git-fix-gtkassistant.patch Sat Mar 13 17:32:03 2010
@@ -1,0 +1,34 @@
+From ca7f14947bd85a340c4a139d758491d382e8fea5 Mon Sep 17 00:00:00 2001
+From: Torsten Schönfeld <kaffeetisch at gmx.de>
+Date: Sat, 06 Mar 2010 01:24:48 +0000
+Subject: Fix a test failure in GtkAssistant.t
+
+GtkAssistant's get_nth_page() recently got fixed so that it returns the
+last page when asked for page -1 (as the docs have been saying all
+along).  So skip asserting the contrary.
+---
+diff --git a/t/GtkAssistant.t b/t/GtkAssistant.t
+index 4bd0b25..32e798f 100644
+--- a/t/GtkAssistant.t
++++ b/t/GtkAssistant.t
+@@ -3,7 +3,7 @@
+ 
+ use strict;
+ use Gtk2::TestHelper
+-  tests => 27,
++  tests => 26,
+   at_least_version => [2, 10, 0, "GtkAssistant is new in 2.10"];
+ 
+ #typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
+@@ -39,7 +39,6 @@ is ($assistant->get_current_page (), -1, "none set yet");
+ $assistant->set_current_page (3);
+ is ($assistant->get_current_page (), 3);
+ 
+-ok (! $assistant->get_nth_page (-1));
+ my $page = $assistant->get_nth_page (2);
+ isa_ok ($page, 'Gtk2::Widget');
+ 
+--
+cgit v0.8.3.1
+
+

Added: trunk/libgtk2-perl/debian/patches/git-fix-gtkbuildable.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/git-fix-gtkbuildable.patch?rev=54219&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/git-fix-gtkbuildable.patch (added)
+++ trunk/libgtk2-perl/debian/patches/git-fix-gtkbuildable.patch Sat Mar 13 17:32:03 2010
@@ -1,0 +1,31 @@
+From d0b0e0baf7a611c307040cef13773556a4898d08 Mon Sep 17 00:00:00 2001
+From: Torsten Schönfeld <kaffeetisch at gmx.de>
+Date: Sat, 06 Mar 2010 01:20:50 +0000
+Subject: Fix a test failure in GtkBuildableIface.t
+
+GtkWidget's implementation of the GtkBuildable methods
+set_name()/get_name() recently changed such that we cannot rely anymore
+on Gtk2::Widget::get_name() and Gtk2::Buildable::get_name() returning
+the same string for objects that inherit the Gtk2::Buildable
+implementation from Gtk2::Widget.
+---
+diff --git a/t/GtkBuildableIface.t b/t/GtkBuildableIface.t
+index 8a576b4..5b766c7 100644
+--- a/t/GtkBuildableIface.t
++++ b/t/GtkBuildableIface.t
+@@ -68,7 +68,11 @@ sub on_thing1_changed {
+ 
+ my $view1 = $builder->get_object ('view1');
+ isa_ok ($view1, 'TestThingView');
+-is ($view1->get_name (), 'view1');
++# TestThingView doesn't directly implement Gtk2::Buildable, thus it's not first
++# in the @ISA chain.  So get_name() alone actually resolves to
++# Gtk2::Widget::get_name(), which breaks things as of gtk+ commit
++# 46f5ee1d0c0f4601853ed57e99b1b513f1baa445.  So fully qualify the method.
++is ($view1->Gtk2::Buildable::get_name (), 'view1');
+ ok (! $view1->get ('visible'));
+ is ($view1->get ('thing'), $thing1);
+ is ($view1->get ('color-string'), 'purple');
+--
+cgit v0.8.3.1
+

Modified: trunk/libgtk2-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/series?rev=54219&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/patches/series (original)
+++ trunk/libgtk2-perl/debian/patches/series Sat Mar 13 17:32:03 2010
@@ -4,3 +4,5 @@
 #disable-socket-plug-tests
 gtktreeview_expand.patch
 gtkprintsettings_default_return_values
+git-fix-gtkassistant.patch
+git-fix-gtkbuildable.patch