[DRE-commits] r1692 - in packages/libcairo-ruby/trunk/debian: . patches

[paulvt at alioth.debian.org]

Author: paulvt
Date: 2007-06-13 14:27:26 +0000 (Wed, 13 Jun 2007)
New Revision: 1692

Added:
   packages/libcairo-ruby/trunk/debian/patches/
   packages/libcairo-ruby/trunk/debian/patches/001-extconf-ruby1.9.patch
   packages/libcairo-ruby/trunk/debian/patches/002-missing-decl-and-string-len-struct.patch
Modified:
   packages/libcairo-ruby/trunk/debian/changelog
   packages/libcairo-ruby/trunk/debian/rules
Log:
* Enabled CDBS simple patch sys in debian/rules.
* Added patch 001-extconf-ruby1.9.patch to fix the API incompatbility
  with ruby1.9.
* Added patch 002-missing-decl-and-string-len-struct.patch to add a
  missing variable declaration and fix struct member errors
  (courtesy of Michael Ablassmeier).

Modified: packages/libcairo-ruby/trunk/debian/changelog
===================================================================
--- packages/libcairo-ruby/trunk/debian/changelog	2007-06-13 13:31:43 UTC (rev 1691)
+++ packages/libcairo-ruby/trunk/debian/changelog	2007-06-13 14:27:26 UTC (rev 1692)
@@ -2,6 +2,12 @@
 
   * New upstream release.
   * Bumped libcairo2-dev requirement to >= 1.2.0.
+  * Enabled CDBS simple patch sys in debian/rules.
+  * Added patch 001-extconf-ruby1.9.patch to fix the API incompatbility
+    with ruby1.9.
+  * Added patch 002-missing-decl-and-string-len-struct.patch to add a
+    missing variable declaration and fix struct member errors
+    (courtesy of Michael Ablassmeier).
 
  -- Paul van Tilburg <paulvt at debian.org>  Wed, 13 Jun 2007 14:26:29 +0100
 

Added: packages/libcairo-ruby/trunk/debian/patches/001-extconf-ruby1.9.patch
===================================================================
--- packages/libcairo-ruby/trunk/debian/patches/001-extconf-ruby1.9.patch	                        (rev 0)
+++ packages/libcairo-ruby/trunk/debian/patches/001-extconf-ruby1.9.patch	2007-06-13 14:27:26 UTC (rev 1692)
@@ -0,0 +1,11 @@
+--- extconf.rb.orig	2007-06-13 14:33:38.000000000 +0100
++++ extconf.rb	2007-06-13 14:26:07.000000000 +0100
+@@ -80,7 +80,7 @@
+ File.open("Makefile", "w") do |f|
+   objs = []
+   co = nil
+-  makefile.each do |line|
++  makefile.each_line do |line|
+     case line
+     when /^TARGET\s*=\s*/
+       f.print("TARGET = #{ext_dir_name}/#{$POSTMATCH}")

Added: packages/libcairo-ruby/trunk/debian/patches/002-missing-decl-and-string-len-struct.patch
===================================================================
--- packages/libcairo-ruby/trunk/debian/patches/002-missing-decl-and-string-len-struct.patch	                        (rev 0)
+++ packages/libcairo-ruby/trunk/debian/patches/002-missing-decl-and-string-len-struct.patch	2007-06-13 14:27:26 UTC (rev 1692)
@@ -0,0 +1,35 @@
+--- src/rb_cairo_surface.c.orig	2007-06-13 14:45:28.000000000 +0100
++++ src/rb_cairo_surface.c	2007-06-13 14:46:59.000000000 +0100
+@@ -30,6 +30,7 @@
+ VALUE rb_cCairo_PSSurface;
+ VALUE rb_cCairo_SVGSurface;
+ VALUE rb_cCairo_WIN32Surface;
++VALUE ruby_errinfo;
+ 
+ static ID cr_id_target;
+ static ID cr_id_read;
+@@ -133,13 +134,13 @@
+   output = closure->target;
+   data = rb_str_new ((const char *)closure->data, closure->length);
+ 
+-  length = RSTRING (data)->len;
++  length = RSTRING_LEN(data);
+   while (length != 0)
+     {
+       VALUE rb_written_bytes = rb_funcall (output, cr_id_write, 1, data);
+       written_bytes = NUM2LONG (rb_written_bytes);
+       data = rb_str_substr (data, written_bytes,
+-                            RSTRING (data)->len - written_bytes);
++                            RSTRING_LEN(data) - written_bytes);
+       length -= written_bytes;
+     }
+   
+@@ -180,7 +181,7 @@
+   
+   result = rb_str_new2 ("");
+ 
+-  for (rest = length; rest != 0; rest = length - RSTRING (result)->len)
++  for (rest = length; rest != 0; rest = length - RSTRING_LEN(result))
+     {
+       rb_str_concat (result, rb_funcall (input, cr_id_read, 1, INT2NUM (rest)));
+     }

Modified: packages/libcairo-ruby/trunk/debian/rules
===================================================================
--- packages/libcairo-ruby/trunk/debian/rules	2007-06-13 13:31:43 UTC (rev 1691)
+++ packages/libcairo-ruby/trunk/debian/rules	2007-06-13 14:27:26 UTC (rev 1692)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 #
-# CDBS file to build the libcairo-ruby packages.
+# CDBS file to build the RCairo packages.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk