Hello community, here is the log from the commit of package perl-Gtk2 for openSUSE:Factory checked in at 2013-07-08 22:25:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Gtk2 (Old) and /work/SRC/openSUSE:Factory/.perl-Gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Gtk2" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Gtk2/perl-Gtk2.changes 2013-01-31 10:28:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Gtk2.new/perl-Gtk2.changes 2013-07-08 22:25:08.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jul 8 11:58:02 UTC 2013 - co...@suse.com + +- updated to 1.247 + * Require Glib 1.280 for the fixes to custom signal marshalling. + * Fix a test failure in t/GtkRecentChooser.t. + * Created %meta_merge which follows v2 of CPAN Meta Spec + - %meta_merge is used for generating metadata via + ExtUtils::MakeMaker/CPAN::Meta + + * Improve the failure diagnostics of some tests + * Fix two test failures. + * Disable the correct potentially annoying test for GtkDnD. + * Tell CPAN to some ignore POD fragments + * Avoid trying to re-register a GType for GConnectFlags. +- remove perl-Gtk2-fix-GtkRecentChooser-test-fails.patch + +------------------------------------------------------------------- Old: ---- Gtk2-1.242.tar.gz perl-Gtk2-fix-GtkRecentChooser-test-fails.patch New: ---- Gtk2-1.247.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Gtk2.spec ++++++ --- /var/tmp/diff_new_pack.GCixrU/_old 2013-07-08 22:25:09.000000000 +0200 +++ /var/tmp/diff_new_pack.GCixrU/_new 2013-07-08 22:25:09.000000000 +0200 @@ -17,17 +17,14 @@ Name: perl-Gtk2 -Version: 1.242 +Version: 1.247 Release: 0 %define cpan_name Gtk2 Summary: Perl interface to the 2 License: LGPL-2.1+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Gtk2/ -#Source: http://www.cpan.org/modules/by-module/Gtk2/Gtk2-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz -#PATCH-FIX-UPSTREAM perl-Gtk2-fix-GtkRecentChooser-test-fails.patch -- fixed GtkRecentChooser test fails [bgo#685865] -Patch0: perl-Gtk2-fix-GtkRecentChooser-test-fails.patch +Source: http://www.cpan.org/modules/by-module/Gtk2/Gtk2-%{version}.tar.gz BuildRequires: perl BuildRequires: perl-macros BuildRequires: update-desktop-files @@ -56,7 +53,6 @@ %prep %setup -q -n %{cpan_name}-%{version} -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ Gtk2-1.242.tar.gz -> Gtk2-1.247.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/MANIFEST new/Gtk2-1.247/MANIFEST --- old/Gtk2-1.242/MANIFEST 2012-01-20 08:53:30.000000000 +0100 +++ new/Gtk2-1.247/MANIFEST 2013-02-04 07:17:51.000000000 +0100 @@ -578,4 +578,5 @@ xs_files-2.4 xs_files-2.6 xs_files-2.8 -META.yml Module meta-data (added by MakeMaker) +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/META.json new/Gtk2-1.247/META.json --- old/Gtk2-1.242/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Gtk2-1.247/META.json 2013-02-04 07:17:51.000000000 +0100 @@ -0,0 +1,57 @@ +{ + "abstract" : "Perl interface to the 2.x series of the Gimp Toolkit library", + "author" : [ + "gtk2-perl Team <gtk-perl-list at gnome dot org>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.112621", + "license" : [ + "lgpl_2_1" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "Gtk2", + "no_index" : { + "directory" : [ + "t", + "inc", + "tools", + "xs" + ], + "file" : [ + "Makefile.PL", + "gtk-demo/main.pl" + ] + }, + "prereqs" : { + "configure" : { + "requires" : { + "Cairo" : "1.000", + "ExtUtils::Depends" : "0.300", + "ExtUtils::PkgConfig" : "1.030", + "Glib" : "1.280", + "Pango" : "1.220" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "mailto" : "bug-Gtk2 [at] rt.cpan.org", + "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=Gtk2"; + }, + "homepage" : "http://gtk2-perl.sourceforge.net";, + "license" : [ + "http://www.gnu.org/licenses/lgpl-2.1.html"; + ], + "repository" : { + "type" : "git", + "url" : "git://git.gnome.org/perl-Gtk2", + "web" : "http://git.gnome.org/browse/perl-Gtk2"; + }, + "x_MailingList" : "https://mail.gnome.org/mailman/listinfo/gtk-perl-list"; + }, + "version" : "1.247" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/META.yml new/Gtk2-1.247/META.yml --- old/Gtk2-1.242/META.yml 2012-01-20 08:53:30.000000000 +0100 +++ new/Gtk2-1.247/META.yml 2013-02-04 07:17:51.000000000 +0100 @@ -1,32 +1,34 @@ ---- #YAML:1.0 -name: Gtk2 -version: 1.242 -abstract: Perl interface to the 2.x series of the Gimp Toolkit library -author: [] -license: unknown -distribution_type: module +--- +abstract: 'Perl interface to the 2.x series of the Gimp Toolkit library' +author: + - 'gtk2-perl Team <gtk-perl-list at gnome dot org>' +build_requires: {} configure_requires: - Cairo: 1.000 - ExtUtils::Depends: 0.300 - ExtUtils::MakeMaker: 0 - ExtUtils::PkgConfig: 1.030 - Glib: 1.240 - Pango: 1.220 -build_requires: - ExtUtils::MakeMaker: 0 -requires: - Cairo: 1.000 - ExtUtils::Depends: 0.300 - ExtUtils::PkgConfig: 1.030 - Glib: 1.240 - Pango: 1.220 -no_index: - directory: - - t - - inc - - tools - - xs -generated_by: ExtUtils::MakeMaker version 6.57_05 + Cairo: 1.000 + ExtUtils::Depends: 0.300 + ExtUtils::PkgConfig: 1.030 + Glib: 1.280 + Pango: 1.220 +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.112621' +license: lgpl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Gtk2 +no_index: + directory: + - t + - inc + - tools + - xs + file: + - Makefile.PL + - gtk-demo/main.pl +resources: + bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Gtk2 + homepage: http://gtk2-perl.sourceforge.net + license: http://www.gnu.org/licenses/lgpl-2.1.html + repository: git://git.gnome.org/perl-Gtk2 + x_MailingList: https://mail.gnome.org/mailman/listinfo/gtk-perl-list +version: 1.247 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/Makefile.PL new/Gtk2-1.247/Makefile.PL --- old/Gtk2-1.242/Makefile.PL 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/Makefile.PL 2013-02-04 07:06:28.000000000 +0100 @@ -1,5 +1,5 @@ -# Copyright (C) 2003-2011 by the gtk2-perl team (see the file AUTHORS for the -# full list) +# Copyright (C) 2003-2011, 2013 by the gtk2-perl team (see the file AUTHORS +# for the full list) # # This library is free software; you can redistribute it and/or modify it under # the terms of the GNU Library General Public License as published by the Free @@ -33,7 +33,7 @@ our %build_reqs = ( 'perl-ExtUtils-Depends' => '0.300', 'perl-ExtUtils-PkgConfig' => '1.030', - 'perl-Glib' => '1.240', + 'perl-Glib' => '1.280', 'perl-Pango' => '1.220', 'perl-Cairo' => '1.000', 'Gtk+' => '2.0.0', @@ -269,6 +269,44 @@ our @exports; require 'Gtk2.exports'; +my %meta_merge = ( + q(meta-spec) => { + version => '2', + url => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec', + }, + author => + ['gtk2-perl Team <gtk-perl-list at gnome dot org>'], + release_status => 'stable', + # valid values: https://metacpan.org/module/CPAN::Meta::Spec#license + license => 'lgpl_2_1', + resources => { + license => 'http://www.gnu.org/licenses/lgpl-2.1.html', + homepage => 'http://gtk2-perl.sourceforge.net', + x_MailingList => + 'https://mail.gnome.org/mailman/listinfo/gtk-perl-list', + bugtracker => { + web => + 'http://rt.cpan.org/Public/Dist/Display.html?Name=Gtk2', + mailto => 'bug-Gtk2 [at] rt.cpan.org', + }, + repository => { + url => 'git://git.gnome.org/perl-Gtk2', + type => 'git', + web => 'http://git.gnome.org/browse/perl-Gtk2', + }, + }, + prereqs => { + configure => { + requires => {%PREREQ_PM}, # no direct ref for 5.14 compatibility + }, + }, + no_index => { + directory => [qw/tools xs/], + file => [qw|Makefile.PL gtk-demo/main.pl|], + }, +); + + WriteMakefile( NAME => 'Gtk2', VERSION_FROM => 'lib/Gtk2.pm', # finds $VERSION @@ -278,12 +316,7 @@ MAN3PODS => \%pod_files, FUNCLIST => \@exports, DL_FUNCS => { Gtk2 => [] }, - - META_MERGE => { - configure_requires => \%PREREQ_PM, - no_index => { directory => [qw/tools xs/] }, - }, - + META_MERGE => \%meta_merge, $gtk2->get_makefile_vars, ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/NEWS new/Gtk2-1.247/NEWS --- old/Gtk2-1.242/NEWS 2012-01-20 08:49:55.000000000 +0100 +++ new/Gtk2-1.247/NEWS 2013-02-04 07:10:57.000000000 +0100 @@ -1,3 +1,33 @@ +Overview of changes in Gtk2 1.247 +================================= + +* Require Glib 1.280 for the fixes to custom signal marshalling. +* Fix a test failure in t/GtkRecentChooser.t. +* Created %meta_merge which follows v2 of CPAN Meta Spec + - %meta_merge is used for generating metadata via + ExtUtils::MakeMaker/CPAN::Meta + +Overview of changes in Gtk2 1.246 +================================= + +* Improve the failure diagnostics of some tests + +Overview of changes in Gtk2 1.245 +================================= + +* Fix two test failures. + +Overview of changes in Gtk2 1.244 +================================= + +* Disable the correct potentially annoying test for GtkDnD. +* Tell CPAN to some ignore POD fragments + +Overview of changes in Gtk2 1.243 +================================= + +* Avoid trying to re-register a GType for GConnectFlags. + Overview of changes in Gtk2 1.242 ================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/README new/Gtk2-1.247/README --- old/Gtk2-1.242/README 2012-01-20 08:50:42.000000000 +0100 +++ new/Gtk2-1.247/README 2013-02-02 20:31:58.000000000 +0100 @@ -1,5 +1,5 @@ -Gtk2 version 1.242 -================== +Gtk2 +==== Perl bindings to the 2.x series of the Gtk+ graphical user interface library. This module allows you to write graphical user interfaces in a Perlish and @@ -61,7 +61,7 @@ This module requires these other modules and libraries: perl >= 5.8.0 - Glib >= 1.240 (Perl module) + Glib >= 1.280 (Perl module) Pango >= 1.220 (Perl module) GTK+ > 2.x (C library) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/lib/Gtk2.pm new/Gtk2-1.247/lib/Gtk2.pm --- old/Gtk2-1.242/lib/Gtk2.pm 2012-01-20 08:51:07.000000000 +0100 +++ new/Gtk2-1.247/lib/Gtk2.pm 2013-02-04 07:17:34.000000000 +0100 @@ -73,7 +73,7 @@ use Exporter; require DynaLoader; -our $VERSION = '1.242'; +our $VERSION = '1.247'; our @ISA = qw(DynaLoader Exporter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/00.Gtk2.t new/Gtk2-1.247/t/00.Gtk2.t --- old/Gtk2-1.242/t/00.Gtk2.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/00.Gtk2.t 2013-02-04 06:42:39.000000000 +0100 @@ -15,20 +15,17 @@ # NOTE: this is the bootstrap test -- no Gtk2::TestHelper here! -use Test::More tests => 44; -BEGIN { use_ok('Gtk2', ':constants') }; +use Test::More tests => 30; +BEGIN { use_ok('Gtk2') }; ######################### my @run_version = Gtk2->get_version_info; my @compile_version = Gtk2->GET_VERSION_INFO; -# Pango has only a compile-time version -my @pango_compile_version = Gtk2::Pango->GET_VERSION_INFO; diag 'Testing Gtk2 ', $Gtk2::VERSION; diag ' Running against gtk+ ', join '.', @run_version; diag ' Compiled against gtk+ ', join '.', @compile_version; -diag ' and pango ', join '.', @pango_compile_version; is( @run_version, 3, 'version info is three items long' ); is (Gtk2->check_version(0,0,0), 'Gtk+ version too new (major mismatch)', @@ -46,47 +43,18 @@ is (Gtk2::MINOR_VERSION, $compile_version[1], 'MINOR_VERSION'); is (Gtk2::MICRO_VERSION, $compile_version[2], 'MICRO_VERSION'); -is (@pango_compile_version, 3, 'version info is three items long'); -ok (Gtk2::Pango->CHECK_VERSION(0,0,0), 'CHECK_VERSION pass'); -ok (!Gtk2::Pango->CHECK_VERSION(50,0,0), 'CHECK_VERSION fail'); - ######################### -# Test the exported constants -my @constants = qw/GDK_CURRENT_TIME - GDK_PRIORITY_EVENTS - GDK_PRIORITY_REDRAW - GTK_PRIORITY_RESIZE/; -my $number = qr/^\d+$/; -foreach my $constant (@constants) { - like (eval "Gtk2::$constant", $number); - like (eval "$constant", $number); -} - SKIP: { Gtk2->disable_setlocale; - @ARGV = qw(--help --name gtk2perl --urgs tree); - skip 'Gtk2->init_check failed, probably unable to open DISPLAY', - 19, unless( Gtk2->init_check ); + 18, unless( Gtk2->init_check ); ok( Gtk2->init ); ok( Gtk2->set_locale ); - is_deeply(\@ARGV, [qw(--help --urgs tree)]); - - SKIP: - { - skip "parse_args is new in 2.4.5", 1 - unless Gtk2->CHECK_VERSION (2, 4, 5); - - # we can't do much more than just calling it, since it always - # immediately returns if init() was called already. - ok( Gtk2->parse_args ); - } - isa_ok( Gtk2->get_default_language, "Gtk2::Pango::Language" ); is( Gtk2->main_level, 0, 'main level is zero when there are no loops' ); @@ -154,25 +122,7 @@ ok(1); } -SKIP: { - skip 'new 2.6 stuff', 1 - unless Gtk2->CHECK_VERSION(2, 6, 0); - - my $foos = 1; - my $options = [ - [ 'foos', 'f', 'int', \$foos ], - ]; - - my $context = Glib::OptionContext->new ('- urgsify your life'); - $context->add_main_entries ($options, 'C'); - $context->add_group (Gtk2->get_option_group (0)); - - @ARGV = qw(--name Foo --foos 23); - $context->parse (); - is ($foos, 23); -} - __END__ -Copyright (C) 2003-2004 by the gtk2-perl team (see the file AUTHORS for the -full list). See LICENSE for more information. +Copyright (C) 2003-2004, 2013 by the gtk2-perl team (see the file AUTHORS for +the full list). See LICENSE for more information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GdkDisplay.t new/Gtk2-1.247/t/GdkDisplay.t --- old/Gtk2-1.242/t/GdkDisplay.t 2012-01-20 08:45:30.000000000 +0100 +++ new/Gtk2-1.247/t/GdkDisplay.t 2012-07-03 21:04:37.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; use Gtk2::TestHelper - tests => 24, + tests => 26, at_least_version => [2, 2, 0, "GdkDisplay is new in 2.2"]; # $Id$ @@ -34,11 +34,11 @@ isa_ok(($display -> list_devices())[0], "Gtk2::Gdk::Device"); -# $display -> put_event(Gtk2::Gdk::Event -> new("button-press")); -# isa_ok($display -> peek_event(), "Gtk2::Gdk::Event"); -# isa_ok($display -> get_event(), "Gtk2::Gdk::Event"); +$display -> put_event(Gtk2::Gdk::Event -> new("button-press")); +isa_ok($display -> peek_event(), "Gtk2::Gdk::Event"); +isa_ok($display -> get_event(), "Gtk2::Gdk::Event"); -# $display -> set_double_click_time(20); +$display -> set_double_click_time(20); my ($screen, $x, $y, $mask) = $display -> get_pointer(); isa_ok($screen, "Gtk2::Gdk::Screen"); @@ -53,7 +53,7 @@ unless Gtk2 -> CHECK_VERSION(2, 4, 0); $display -> flush(); - # $display -> set_double_click_distance(5); + $display -> set_double_click_distance(5); ok(defined($display -> supports_cursor_color())); ok(defined($display -> supports_cursor_alpha())); @@ -95,7 +95,7 @@ skip("new 2.8 stuff", 0) unless Gtk2 -> CHECK_VERSION(2, 8, 0); - # $display -> warp_pointer($screen, 100, 100); + $display -> warp_pointer($screen, 100, 100); } SKIP: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GdkDnd.t new/Gtk2-1.247/t/GdkDnd.t --- old/Gtk2-1.242/t/GdkDnd.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GdkDnd.t 2012-07-03 21:04:37.000000000 +0200 @@ -55,7 +55,7 @@ unless defined $destination; # FIXME: what about the return value? - $context -> motion($destination, $protocol, 0, 0, [qw(copy)], [qw(copy move)], 0); + $context -> motion($destination, $protocol, 100, 100, [qw(copy)], [qw(copy move)], 0); ok($context -> actions() == [qw(copy move)]); ok($context -> suggested_action() == qw(copy)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkAdjustment.t new/Gtk2-1.247/t/GtkAdjustment.t --- old/Gtk2-1.242/t/GtkAdjustment.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkAdjustment.t 2012-11-10 22:35:52.000000000 +0100 @@ -34,7 +34,7 @@ $adjustment -> value_changed(); SKIP: { - skip "stuff that's new in 2.14", 5 + skip "stuff that's new in 2.14", 11 unless Gtk2->CHECK_VERSION (2, 14, 0); # note "value" forced to "lower <= value <= upper-page_size" by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkEditable.t new/Gtk2-1.247/t/GtkEditable.t --- old/Gtk2-1.242/t/GtkEditable.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkEditable.t 2013-02-02 20:31:58.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use Gtk2::TestHelper tests => 10; +use Gtk2::TestHelper tests => 11; use utf8; # for the umlaut test @@ -40,9 +40,31 @@ $entry -> paste_clipboard(); $entry -> delete_selection(); -$entry -> signal_connect(insert_text => sub { return (); }); -$entry -> set_text("äöü"); -is($entry -> get_text(), "äöü"); +# Test the custom insert-text marshaller. +{ + my $entry = Gtk2::Entry -> new(); + $entry -> set_text("äöü"); + $entry -> signal_connect(insert_text => sub { + my ($entry, $new_text, $new_text_length, $position, $data) = @_; + $_[1] = reverse $new_text; + $_[3] = 0; + return (); + }); + $entry -> insert_text("123", 3); + is($entry -> get_text(), "321äöü"); +} +{ + my $entry = Gtk2::Entry -> new(); + $entry -> set_text("äöü"); + $entry -> signal_connect('insert-text' => sub { + my ($entry, $new_text, $new_text_length, $position, $data) = @_; + my $mangled_new_text = reverse $new_text; + my $mangled_position = 0; + return ($mangled_new_text, $mangled_position); + }); + $entry -> insert_text("123", 3); + is($entry -> get_text(), "321äöü"); +} __END__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkMenuItem.t new/Gtk2-1.247/t/GtkMenuItem.t --- old/Gtk2-1.242/t/GtkMenuItem.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkMenuItem.t 2013-02-02 20:31:58.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use Gtk2::TestHelper tests => 20; +use Gtk2::TestHelper tests => 23; # $Id$ @@ -41,13 +41,16 @@ $item -> remove_submenu(); $item -> set_accel_path("<bla/bla/bla>"); -$item -> signal_connect(toggle_size_request => sub { - is (shift, $item); - is (shift, "bla"); - return 23; -}, "bla"); - -is ($item -> toggle_size_request(), 23); +# Ensure that both spellings of the signal name get the custom marshaller. +foreach my $signal_name (qw/toggle_size_request toggle-size-request/) { + my $id = $item -> signal_connect($signal_name => sub { + is (shift, $item, $signal_name); + is (shift, "bla", $signal_name); + return 23; + }, "bla"); + is ($item -> toggle_size_request(), 23); + $item -> signal_handler_disconnect ($id); +} $item -> signal_connect(toggle_size_allocate => sub { is (shift, $item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkRecentChooser.t new/Gtk2-1.247/t/GtkRecentChooser.t --- old/Gtk2-1.242/t/GtkRecentChooser.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkRecentChooser.t 2013-02-02 20:31:58.000000000 +0100 @@ -51,6 +51,7 @@ # add_item() is asynchronous, so let the main loop spin for a while Gtk2->main_iteration while scalar (my @items = $manager->get_items) < 2; +$manager->signal_emit("changed"); $chooser -> set_select_multiple(FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkStatusIcon.t new/Gtk2-1.247/t/GtkStatusIcon.t --- old/Gtk2-1.242/t/GtkStatusIcon.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkStatusIcon.t 2012-11-10 22:35:52.000000000 +0100 @@ -108,10 +108,10 @@ # Make sure the returned rectangle is valid. It's a copy of a stack # object, so we just need to ensure that the values are in some sane # range, rather than garbage. - ok (abs $area->x <= Gtk2::Gdk->screen_width ()); - ok (abs $area->y <= Gtk2::Gdk->screen_height ()); - ok ($area->width <= Gtk2::Gdk->screen_width ()); - ok ($area->height <= Gtk2::Gdk->screen_height ()); + cmp_ok (abs $area->x, '<=', Gtk2::Gdk->screen_width ()); + cmp_ok (abs $area->y, '<=', Gtk2::Gdk->screen_height ()); + cmp_ok (abs $area->width, '<=', Gtk2::Gdk->screen_width ()); + cmp_ok (abs $area->height, '<=', Gtk2::Gdk->screen_height ()); } # --------------------------------------------------------------------------- # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/GtkTreeModel.t new/Gtk2-1.247/t/GtkTreeModel.t --- old/Gtk2-1.242/t/GtkTreeModel.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/GtkTreeModel.t 2013-02-02 20:31:58.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use Gtk2::TestHelper tests => 73, noinit => 1; +use Gtk2::TestHelper tests => 74, noinit => 1; # $Id$ @@ -199,11 +199,14 @@ $model -> row_has_child_toggled($path_one, $iter_one); $model -> row_deleted($path_one); -$model -> signal_connect(rows_reordered => sub { - is_deeply($_[3], [3, 2, 1, 0]); -}); - -$model -> rows_reordered($path_one, undef, 3, 2, 1, 0); +# Ensure that both spellings of the signal name get the custom marshaller. +foreach my $signal_name (qw/rows_reordered rows-reordered/) { + my $id = $model -> signal_connect($signal_name => sub { + is_deeply($_[3], [3, 2, 1, 0], $signal_name); + }); + $model -> rows_reordered($path_one, undef, 3, 2, 1, 0); + $model -> signal_handler_disconnect($id); +} ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/t/PangoCairo.t new/Gtk2-1.247/t/PangoCairo.t --- old/Gtk2-1.242/t/PangoCairo.t 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/t/PangoCairo.t 2012-11-10 22:35:52.000000000 +0100 @@ -128,6 +128,8 @@ my $desc = Gtk2::Pango::FontDescription -> from_string('Sans 10'); my $font = $fontmap -> load_font($context, $desc); + skip 'could not find font', 2 + unless defined $font; isa_ok($font, 'Gtk2::Pango::Cairo::Font'); isa_ok($font -> get_scaled_font(), 'Cairo::ScaledFont'); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/xs/GdkPixbuf.xs new/Gtk2-1.247/xs/GdkPixbuf.xs --- old/Gtk2-1.242/xs/GdkPixbuf.xs 2012-01-20 08:46:08.000000000 +0100 +++ new/Gtk2-1.247/xs/GdkPixbuf.xs 2013-02-04 06:43:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2008, 2010-2012 by the gtk2-perl team (see the file + * Copyright (c) 2003-2008, 2010-2013 by the gtk2-perl team (see the file * AUTHORS) * * This library is free software; you can redistribute it and/or @@ -123,6 +123,7 @@ sv_catpvn_nomg (sv, data, count); /* XXX no way to find out if that failed. */ + PERL_UNUSED_VAR (error); return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/xs/GtkBuilder.xs new/Gtk2-1.247/xs/GtkBuilder.xs --- old/Gtk2-1.242/xs/GtkBuilder.xs 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/xs/GtkBuilder.xs 2012-04-28 06:00:45.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007 by the gtk2-perl team (see the file AUTHORS) + * Copyright (c) 2007, 2012 by the gtk2-perl team (see the file AUTHORS) * * Licensed under the LGPL, see LICENSE file for more information. * @@ -21,7 +21,12 @@ { G_CONNECT_SWAPPED, "G_CONNECT_SWAPPED", "swapped" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GConnectFlags", values); + /* This is actually a race condition, but I don't think it + * matters too much in this case. */ + etype = g_type_from_name ("GConnectFlags"); + if (etype == 0) { + etype = g_flags_register_static ("GConnectFlags", values); + } } return etype; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gtk2-1.242/xs/GtkTreeModel.xs new/Gtk2-1.247/xs/GtkTreeModel.xs --- old/Gtk2-1.242/xs/GtkTreeModel.xs 2011-11-27 08:57:26.000000000 +0100 +++ new/Gtk2-1.247/xs/GtkTreeModel.xs 2012-04-28 06:01:09.000000000 +0200 @@ -1,5 +1,6 @@ /* - * Copyright (c) 2003-2005, 2010 by the gtk2-perl team (see the file AUTHORS) + * Copyright (c) 2003-2005, 2010, 2012 by the gtk2-perl team (see the file + * AUTHORS) * * Licensed under the LGPL, see LICENSE file for more information. * @@ -1409,7 +1410,7 @@ if (items - 3 != n) croak ("rows_reordered expects a list of as many indices" " as the selected node of the model has children\n" - " got %" IVdf ", expected %d", items - 3, n); + " got %d, expected %d", (int) (items - 3), n); new_order = g_new (gint, n); for (i = 0 ; i < n ; i++) new_order[i] = SvIV (ST (3+i)); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
