Mailinglist Archive: opensuse-commit (869 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package perl-Cairo for openSUSE:Factory
checked in at Thu Oct 14 14:33:20 CEST 2010.



--------
--- perl-Cairo/perl-Cairo.changes       2010-01-10 15:54:32.000000000 +0100
+++ perl-Cairo/perl-Cairo.changes       2010-10-13 12:24:32.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 13 10:18:28 UTC 2010 - coolo@xxxxxxxxxx
+
+- take patch from launchpad to disable failing tests with current
+  cairo (no upstream fix available yet)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  disable_failing_tests.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Cairo.spec ++++++
--- /var/tmp/diff_new_pack.wpPQdh/_old  2010-10-14 14:32:12.000000000 +0200
+++ /var/tmp/diff_new_pack.wpPQdh/_new  2010-10-14 14:32:12.000000000 +0200
@@ -20,7 +20,7 @@
 
 Name:           perl-Cairo
 Version:        1.061 
-Release:        2
+Release:        9
 Requires:       perl = %{perl_version} perl-ExtUtils-Depends 
perl-ExtUtils-PkgConfig
 BuildRequires:  cairo-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig 
pkgconfig
 AutoReqProv:    on
@@ -29,6 +29,8 @@
 Url:            http://cpan.org//authors/id/T/TS/TSCH/
 Summary:        Perl bindings to the cairo graphics library.
 Source:         Cairo-%{version}.tar.bz2
+# FIX-UPSTREAM coolo@xxxxxxxxxx - take patch from launchpad to fix build with 
current cairo
+Patch0:         disable_failing_tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+%patch0 -p1
 
 %build
 #disable some randomly failing tests

++++++ disable_failing_tests.patch ++++++
libcairo-perl (1.070-1ubuntu1) maverick; urgency=low

  * Temporarily deactivate failing tests in the testsuite: newer
    cairo causing test failures that will not be addressed by
    Maverick release (according to slomo the test suite needs to
    be updated).  Thanks to Didier Roche for investigating the issue.
    (LP: #187823)

 -- Emmet Hikory <persia@xxxxxxxxxx>  Thu, 23 Sep 2010 18:37:35 +0900

Index: Cairo-1.061/t/CairoSurface.t
===================================================================
--- Cairo-1.061.orig/t/CairoSurface.t   2008-10-22 21:48:51.000000000 +0200
+++ Cairo-1.061/t/CairoSurface.t        2010-10-13 12:23:34.219807767 +0200
@@ -12,7 +12,7 @@ use warnings;
 
 use Config; # for byteorder
 
-use Test::More tests => 72;
+use Test::More tests => 74;
 
 use constant IMG_WIDTH => 256;
 use constant IMG_HEIGHT => 256;
@@ -75,8 +75,8 @@ isa_ok ($surf, 'Cairo::Surface');
 
 # Test that the enum wrappers differentiate between color and color-alpha.
 SKIP: {
-       skip 'content tests', 2
-               unless Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 2, 0);
+       skip 'Will not fix before Maverick release', 2;
+               #unless Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 2, 0);
 
        my $tmp = $surf->create_similar ('color-alpha', IMG_WIDTH, IMG_HEIGHT);
        is ($tmp->get_content, 'color-alpha');
@@ -87,8 +87,8 @@ SKIP: {
 $surf->set_device_offset (23, 42);
 
 SKIP: {
-       skip 'new stuff', 2
-               unless Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 2, 0);
+       skip 'Will not fix before Maverick release', 2;
+               #unless Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 2, 0);
 
        is_deeply ([$surf->get_device_offset], [23, 42]);
 
@@ -97,7 +97,11 @@ SKIP: {
        is ($surf->get_type, 'image');
 }
 
-is ($surf->status, 'success');
+SKIP: {
+       skip 'Will not fix before Maverick release', 2;
+
+       is ($surf->status, 'success');
+}
 
 isa_ok ($surf->get_font_options, 'Cairo::FontOptions');
 
@@ -194,8 +198,11 @@ SKIP: {
                $surf->set_size (23, 42);
        }
 
-       $surf = $surf->create_similar ('alpha', IMG_WIDTH, IMG_HEIGHT);
-       isa_ok ($surf, 'Cairo::Surface');
+       SKIP: {
+               skip 'Will not fix before Maverick release', 2;
+               $surf = $surf->create_similar ('alpha', IMG_WIDTH, IMG_HEIGHT);
+               isa_ok ($surf, 'Cairo::Surface');
+       }
 
        # create_similar actually returns an image surface at the moment, but
        # the compatibility layer has no way of knowing this and thus turns it

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx