[DRE-commits] [ruby-gd] 02/03: update restore-ruby18-support.patch to continue port to newer Ruby

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-gd.

commit 02c96d861192225567259f26de6e9af96ab8fa74
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Dec 27 16:09:07 2013 +0100

    update restore-ruby18-support.patch to continue port to newer Ruby
---
 debian/patches/restore-ruby18-support.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/debian/patches/restore-ruby18-support.patch b/debian/patches/restore-ruby18-support.patch
index 5f042be..27e12d7 100644
--- a/debian/patches/restore-ruby18-support.patch
+++ b/debian/patches/restore-ruby18-support.patch
@@ -308,6 +308,18 @@ Last-Update: 2009-09-10
      gdImagePtr iptr;
  
      Check_Type(f, T_FILE);
+@@ -321,9 +341,9 @@
+     rb_io_check_readable(fptr);
+ 
+     /* need cast, and the argument is char* type */
+-    iptr = (gdImagePtr)gdImageCreateFromXpm(fptr->path);
++    iptr = (gdImagePtr)gdImageCreateFromXpm(FPTR_PATH);
+     if (!iptr)
+-        rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)fptr->path);
++        rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)FPTR_PATH);
+ 
+     return Data_Wrap_Struct(klass,0,free_img,iptr);
+ }
 @@ -333,7 +353,7 @@
      VALUE klass, fname;
  {
@@ -317,6 +329,18 @@ Last-Update: 2009-09-10
      gdImagePtr iptr;
      
      Check_Type(fname, T_STRING);
+@@ -344,9 +364,9 @@
+     rb_io_check_readable(fptr);
+ 
+     /* need cast, and the argument is char* type */
+-    iptr = (gdImagePtr)gdImageCreateFromXpm(fptr->path);
++    iptr = (gdImagePtr)gdImageCreateFromXpm(FPTR_PATH);
+     if (!iptr)
+-        rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)fptr->path);
++        rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)FPTR_PATH);
+                  
+     return Data_Wrap_Struct(klass,0,free_img,iptr);
+ }
 @@ -358,7 +378,7 @@
  img_from_jpeg(klass, f)
      VALUE klass, f;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gd.git