svn commit: r402875 - in head/graphics/ruby-gd: . files

[Dirk Meyer]

Author: dinoex
Date: Thu Dec  3 14:20:35 2015
New Revision: 402875
URL: https://svnweb.freebsd.org/changeset/ports/402875

Log:
  - fix build for ruby >= 2.1

Modified:
  head/graphics/ruby-gd/Makefile
  head/graphics/ruby-gd/files/patch-GD.c

Modified: head/graphics/ruby-gd/Makefile
==============================================================================
--- head/graphics/ruby-gd/Makefile	Thu Dec  3 13:05:49 2015	(r402874)
+++ head/graphics/ruby-gd/Makefile	Thu Dec  3 14:20:35 2015	(r402875)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.daifukuya.com/archive/kagemai/lib/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -17,8 +17,7 @@ COMMENT=	Ruby extension library to use T
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgd.so:${PORTSDIR}/graphics/gd
 
-BROKEN_RUBY21=	yes
-BROKEN_RUBY22=	yes
+BROKEN_RUBY20=	yes
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes

Modified: head/graphics/ruby-gd/files/patch-GD.c
==============================================================================
--- head/graphics/ruby-gd/files/patch-GD.c	Thu Dec  3 13:05:49 2015	(r402874)
+++ head/graphics/ruby-gd/files/patch-GD.c	Thu Dec  3 14:20:35 2015	(r402875)
@@ -1,6 +1,6 @@
---- GD.c.orig	Tue Feb  6 15:47:42 2001
-+++ GD.c	Mon Feb 12 19:39:15 2001
-@@ -1200,7 +1200,7 @@
+--- GD.c.orig	2001-05-30 16:14:17.000000000 +0200
++++ GD.c	2015-12-03 15:03:58.428323000 +0100
+@@ -1191,7 +1191,7 @@
      Check_Type(fontname, T_STRING);
      Check_Type(string, T_STRING);
  
@@ -9,7 +9,7 @@
                             &brect[0],
                             NUM2INT(fgcolor),
                             RSTRING(fontname)->ptr,
-@@ -1232,7 +1232,7 @@
+@@ -1223,7 +1223,7 @@
      Check_Type(string, T_STRING);
  
      Data_Get_Struct(img, gdImage, im);
@@ -18,7 +18,16 @@
                             &brect[0],
                             NUM2INT(fgcolor),
                             RSTRING(fontname)->ptr,
-@@ -1971,7 +1971,9 @@
+@@ -1613,7 +1613,7 @@
+ {
+     VALUE self = rb_ary_new();
+ 
+-    RBASIC(self)->klass = klass;
++    rb_obj_reveal(self, klass);
+     return self;
+ }
+ 
+@@ -2508,7 +2508,9 @@
  #endif    
  
  #ifdef HAVE_GDIMAGESTRINGFT