r73854 - in /trunk/libcairo-perl/debian: changelog patches/0001-Fix-spurious-CairoSurface.t-failures.patch patches/disable_failing_tests.patch patches/series

dom at users.alioth.debian.org dom at users.alioth.debian.org
Sat Apr 30 18:23:00 UTC 2011


Author: dom
Date: Sat Apr 30 18:21:57 2011
New Revision: 73854

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73854
Log:
replace patch with one that should actually fix the FTBFS properly

Added:
    trunk/libcairo-perl/debian/patches/0001-Fix-spurious-CairoSurface.t-failures.patch
Removed:
    trunk/libcairo-perl/debian/patches/disable_failing_tests.patch
Modified:
    trunk/libcairo-perl/debian/changelog
    trunk/libcairo-perl/debian/patches/series

Modified: trunk/libcairo-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcairo-perl/debian/changelog?rev=73854&op=diff
==============================================================================
--- trunk/libcairo-perl/debian/changelog (original)
+++ trunk/libcairo-perl/debian/changelog Sat Apr 30 18:21:57 2011
@@ -1,10 +1,10 @@
 libcairo-perl (1.070-2) UNRELEASED; urgency=low
 
-  * Skip failing tests in t/CairoSurface.t (workaround for: #613190)
-    (thanks, Ubuntu)
   * Update Standards-Version (no changes)
+  * Apply upstream patch fixing failing tests in t/CairoSurface.t
+    (Closes: #613190)
 
- -- Dominic Hargreaves <dom at earth.li>  Sat, 30 Apr 2011 17:55:49 +0100
+ -- Dominic Hargreaves <dom at earth.li>  Sat, 30 Apr 2011 19:20:57 +0100
 
 libcairo-perl (1.070-1) unstable; urgency=low
 

Added: trunk/libcairo-perl/debian/patches/0001-Fix-spurious-CairoSurface.t-failures.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcairo-perl/debian/patches/0001-Fix-spurious-CairoSurface.t-failures.patch?rev=73854&op=file
==============================================================================
--- trunk/libcairo-perl/debian/patches/0001-Fix-spurious-CairoSurface.t-failures.patch (added)
+++ trunk/libcairo-perl/debian/patches/0001-Fix-spurious-CairoSurface.t-failures.patch Sat Apr 30 18:21:57 2011
@@ -1,0 +1,45 @@
+From: Torsten Schönfeld <kaffeetisch at gmx.de>
+Date: Sat, 30 Apr 2011 15:45:46 +0200
+Subject: [PATCH] Fix spurious CairoSurface.t failures
+Origin: http://git.gnome.org/browse/perl-Cairo/commit/?h=stable-1-06&id=9073da824de8
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613190
+
+These were caused by a premature call to $surf->finish which made the
+surface that tests were run against unusable.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=632040
+---
+ t/CairoSurface.t |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/t/CairoSurface.t b/t/CairoSurface.t
+index 3f6def1..e0370f6 100644
+--- a/t/CairoSurface.t
++++ b/t/CairoSurface.t
+@@ -67,11 +67,9 @@ is ($surf->get_height, IMG_HEIGHT);
+ 	}
+ }
+ 
+-$surf->finish;
+-
+-$surf = $surf->create_similar ('color', IMG_WIDTH, IMG_HEIGHT);
+-isa_ok ($surf, 'Cairo::ImageSurface');
+-isa_ok ($surf, 'Cairo::Surface');
++my $similar = $surf->create_similar ('color', IMG_WIDTH, IMG_HEIGHT);
++isa_ok ($similar, 'Cairo::ImageSurface');
++isa_ok ($similar, 'Cairo::Surface');
+ 
+ # Test that the enum wrappers differentiate between color and color-alpha.
+ SKIP: {
+@@ -115,6 +113,8 @@ SKIP: {
+ 	like (Cairo::Format::stride_for_width ('argb32', 23), qr/\A\d+\z/);
+ }
+ 
++$surf->finish;
++
+ # --------------------------------------------------------------------------- #
+ 
+ sub clear {
+-- 
+1.7.2.5
+

Modified: trunk/libcairo-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcairo-perl/debian/patches/series?rev=73854&op=diff
==============================================================================
--- trunk/libcairo-perl/debian/patches/series (original)
+++ trunk/libcairo-perl/debian/patches/series Sat Apr 30 18:21:57 2011
@@ -1,1 +1,1 @@
-disable_failing_tests.patch
+0001-Fix-spurious-CairoSurface.t-failures.patch




More information about the Pkg-perl-cvs-commits mailing list