[DRE-commits] [SCM] ruby-opengl.git branch, master, updated. upstream/0.60.1-9-gcb27b2c

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 79e816bd4e5a539d51e1d97215f3a0ef59d3b949
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Dec 29 12:32:04 2011 +0100

    patch: 0300_fix_STR2CSTR - fix build for 1.9

diff --git a/debian/changelog b/debian/changelog
index 669c022..7502d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ ruby-opengl (0.60.1-2) UNRELEASED; urgency=low
   * Transition to gem2deb packaging (Closes: #651702)
     + renaming source and binary packages
   * convert debian/copyright to DEP5
+  * debian/patches/0300_fix_STR2CSTR.patch: replace deprecated STR2CSTR by
+    StringValuePtr
 
- -- Cédric Boutillier <cedric.boutillier at gmail.com>  Sun, 11 Dec 2011 14:34:21 +0100
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Tue, 20 Dec 2011 15:38:41 +0100
 
 libopengl-ruby (0.60.1-1) unstable; urgency=low
 
diff --git a/debian/patches/0300_fix_STR2CSTR.patch b/debian/patches/0300_fix_STR2CSTR.patch
new file mode 100644
index 0000000..259e633
--- /dev/null
+++ b/debian/patches/0300_fix_STR2CSTR.patch
@@ -0,0 +1,16 @@
+Description: replace deprecated STR2CSTR by StringValuePtr
+ http://www.ruby-forum.com/topic/215406
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-12-20
+
+--- a/ext/glut/glut.c
++++ b/ext/glut/glut.c
+@@ -93,7 +93,7 @@
+ 	largc = RARRAY_LEN(orig_arg);
+ 	largv = ALLOCA_N(char*, largc);
+ 	for (i = 0; i < largc; i++)
+-		largv[i] = STR2CSTR(RARRAY_PTR(orig_arg)[i]);
++		largv[i] = StringValuePtr(RARRAY_PTR(orig_arg)[i]);
+ 	
+ 	glutInit(&largc, largv);
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index ca7493d..e665950 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0100_remove_rubygems.patch
+0300_fix_STR2CSTR.patch

-- 
ruby-opengl.git