Attachment #139868 for bug #186228

View | Details | Raw Unified | Return to bug 186228
Collapse All | Expand All

Lines 16-25 Link Here

(-)Makefile (-4 lines)
16		16
17	LIB_DEPENDS= ming:${PORTSDIR}/japanese/ming	17	LIB_DEPENDS= ming:${PORTSDIR}/japanese/ming
18		18
19	BROKEN= fails to build
20	DEPRECATED= Broken for more than 6 month
21	EXPIRATION_DATE= 2014-02-27
22
23	RUBY_MING_VERSION= 0.1.6	19	RUBY_MING_VERSION= 0.1.6
24		20
25	USE_RUBY= yes	21	USE_RUBY= yes




--- ext/ming/ming/ming.c.orig	2003-09-28 13:51:44.000000000 +0900
+++ ext/ming/ming/ming.c	2014-01-29 17:11:21.000000000 +0900
@@ -56,10 +56,10 @@
 {
   if(TYPE(c) != T_STRING)
 	rb_raise(rb_eMingError, "Argument must be a character on keyboard.");
-  if(RSTRING(c)->len != 1)
+  if(RSTRING_LEN(c) != 1)
 	rb_raise(rb_eMingError, "Size of argument must be just 1.");
   
-  return INT2FIX(SWFBUTTON_KEYPRESS(RSTRING(c)->ptr[0]));
+  return INT2FIX(SWFBUTTON_KEYPRESS(RSTRING_PTR(c)[0]));
 }
 
 static VALUE
@@ -68,10 +68,10 @@
 {
   if(TYPE(c) != T_STRING)
 	rb_raise(rb_eMingError, "Argument must be character on keyboard.");
-  if(RSTRING(c)->len != 1)
+  if(RSTRING_LEN(c) != 1)
 	rb_raise(rb_eMingError, "Size of argument must be just 1.");
 
-  return INT2FIX(SWFBUTTON_ONKEYPRESS(RSTRING(c)->ptr[0]));
+  return INT2FIX(SWFBUTTON_ONKEYPRESS(RSTRING_PTR(c)[0]));
 }
 
 void rb_Ming_raise(char *msg, ...)

Line 0 Link Here

(-)files/patch-ext-ming-ming-swfaction.c (+11 lines)
	1	--- ext/ming/ming/swfaction.c.orig 2003-09-28 13:30:00.000000000 +0900
	2	+++ ext/ming/ming/swfaction.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -36,7 +36,7 @@
	4	rb_SWFAction_s_new(self, s)
	5	VALUE self, s;
	6	{
	7	- char *script = STR2CSTR(s);
	8	+ char *script = StringValuePtr(s);
	9	struct RSWFAction *a = ALLOC(struct RSWFAction);
	10	VALUE obj;
	11




--- ext/ming/ming/swfbitmap.c.orig	2003-09-28 11:54:54.000000000 +0900
+++ ext/ming/ming/swfbitmap.c	2014-01-29 17:11:21.000000000 +0900
@@ -39,13 +39,13 @@
 
   rb_scan_args(argc, argv, "11", &f, &a);
 
-  filename = STR2CSTR(f);
+  filename = StringValuePtr(f);
   fp = fopen(filename, "rb");
   if (fp == NULL)
     RAISE_NOF(filename);
 
   if(NIL_P(a)) {
-    len = RSTRING(f)->len;
+    len = RSTRING_LEN(f);
     if(len > 5) {
       ext = &filename[len - 5];
       if(strncmp_ignore_case(ext, ".jpeg", 5) == 0) {
@@ -64,7 +64,7 @@
     }
   } else {
     
-    alpha_filename = STR2CSTR(a);
+    alpha_filename = StringValuePtr(a);
     afp = fopen(alpha_filename, "rb");
     if (afp == NULL) RAISE_NOF(alpha_filename);
     

Line 0 Link Here

(-)files/patch-ext-ming-ming-swfdisplayitem.c (+11 lines)
	1	--- ext/ming/ming/swfdisplayitem.c.orig 2003-09-28 14:40:42.000000000 +0900
	2	+++ ext/ming/ming/swfdisplayitem.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -190,7 +190,7 @@
	4	struct RSWFDisplayItem *i;
	5
	6	Data_Get_Struct(self, struct RSWFDisplayItem, i);
	7	- SWFDisplayItem_setName(i->this, STR2CSTR(n));
	8	+ SWFDisplayItem_setName(i->this, StringValuePtr(n));
	9
	10	return self;
	11	}




--- ext/ming/ming/swffont.c.orig	2003-09-28 12:51:28.000000000 +0900
+++ ext/ming/ming/swffont.c	2014-01-29 17:11:21.000000000 +0900
@@ -44,16 +44,16 @@
 	 VALUE self, n;
 {
   struct RSWFFont *f = ALLOC(struct RSWFFont);
-  char *name = STR2CSTR(n), *ext;
+  char *name = StringValuePtr(n), *ext;
   size_t len;
   FILE *fp;
   VALUE obj;
 
   VALUE path = rb_cv_get(rb_cSWFFont, "@@font_path");
-  len = RSTRING(n)->len;
+  len = RSTRING_LEN(n);
 
   if(len > 4) {
-    ext = &name[RSTRING(n)->len - 4];
+    ext = &name[RSTRING_LEN(n) - 4];
 
     if (strncmp_ignore_case(ext, ".fdb", 4) == 0) {
       fp = search_file(path, name, "rb");
@@ -92,7 +92,7 @@
 
   Data_Get_Struct(self, struct RSWFFont, f);
 
-  return rb_float_new(SWFFont_getStringWidth(f->this, STR2CSTR(s)));
+  return rb_float_new(SWFFont_getStringWidth(f->this, StringValuePtr(s)));
 }
 
 static VALUE




--- ext/ming/ming/swfmovie.c.orig	2003-09-28 13:22:16.000000000 +0900
+++ ext/ming/ming/swfmovie.c	2014-01-29 17:11:21.000000000 +0900
@@ -108,7 +108,7 @@
   int count;
 
   Data_Get_Struct(self, struct RSWFMovie, m);
-  count = SWFMovie_save(m->this, STR2CSTR(s));
+  count = SWFMovie_save(m->this, StringValuePtr(s));
 
   return INT2NUM(count);
 }
@@ -226,7 +226,7 @@
   struct RSWFMovie *m;
 
   Data_Get_Struct(self, struct RSWFMovie, m);
-  SWFMovie_labelFrame(m->this, STR2CSTR(label));
+  SWFMovie_labelFrame(m->this, StringValuePtr(label));
 
   return self;
 }
@@ -248,7 +248,7 @@
 	 VALUE self, n;
 {
   struct RSWFMovie *m;
-  char *name = STR2CSTR(n);
+  char *name = StringValuePtr(n);
   FILE *fp;
   VALUE path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
 #ifdef SUPPORT_PCM
@@ -286,7 +286,7 @@
   Data_Get_Struct(block, struct RSWFBlock, b);
 
   regist_references(m->table, n);
-  SWFMovie_addExport(m->this, b->this, STR2CSTR(n));
+  SWFMovie_addExport(m->this, b->this, StringValuePtr(n));
   
   return self;
 }
@@ -331,7 +331,7 @@
 {
   struct RSWFMovie *m;
   struct RSWFDisplayItem *i;
-  char *name = STR2CSTR(n);
+  char *name = StringValuePtr(n);
   FILE *fp;
   VALUE obj, path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
   SWFSound sound;




--- ext/ming/ming/swfmovieclip.c.orig	2003-09-28 12:33:14.000000000 +0900
+++ ext/ming/ming/swfmovieclip.c	2014-01-29 17:11:21.000000000 +0900
@@ -135,7 +135,7 @@
 
   Data_Get_Struct(self, struct RSWFMovieClip, m);
 
-  SWFMovieClip_labelFrame(m->this, STR2CSTR(s));
+  SWFMovieClip_labelFrame(m->this, StringValuePtr(s));
 
   return self;
 }
@@ -158,7 +158,7 @@
 	 VALUE self, n, r;
 {
   struct RSWFMovie *m;
-  char *name = STR2CSTR(n);
+  char *name = StringValuePtr(n);
   FILE *fp;
   VALUE path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
 #ifdef SUPPORT_PCM




--- ext/ming/ming/swftext.c.orig	2003-09-28 13:30:34.000000000 +0900
+++ ext/ming/ming/swftext.c	2014-01-29 17:11:21.000000000 +0900
@@ -143,7 +143,7 @@
 
   Data_Get_Struct(self, struct RSWFText, p);
 
-  SWFText_addString(p->this, STR2CSTR(s), NULL);
+  SWFText_addString(p->this, StringValuePtr(s), NULL);
   return self;
 }
 
@@ -154,7 +154,7 @@
   struct RSWFText *p;
 
   Data_Get_Struct(self, struct RSWFText, p);
-  return rb_float_new(SWFText_getStringWidth(p->this, STR2CSTR(s)));
+  return rb_float_new(SWFText_getStringWidth(p->this, StringValuePtr(s)));
 }
 
 static VALUE




--- ext/ming/ming/swftextfield.c.orig	2003-09-28 12:01:42.000000000 +0900
+++ ext/ming/ming/swftextfield.c	2014-01-29 17:11:21.000000000 +0900
@@ -209,7 +209,7 @@
   struct RSWFTextField *t;
 
   Data_Get_Struct(self, struct RSWFTextField, t);
-  SWFTextField_addString(t->this, STR2CSTR(s));
+  SWFTextField_addString(t->this, StringValuePtr(s));
 
   return self;
 }
@@ -245,7 +245,7 @@
   struct RSWFTextField *t;
 
   Data_Get_Struct(self, struct RSWFTextField, t);
-  SWFTextField_setVariableName(t->this, STR2CSTR(n));
+  SWFTextField_setVariableName(t->this, StringValuePtr(n));
 
   return self;
 }




--- ext/ming/ming/util.c.orig	2003-09-28 13:30:20.000000000 +0900
+++ ext/ming/ming/util.c	2014-01-29 17:11:17.000000000 +0900
@@ -83,10 +83,10 @@
   if (fp != NULL)
 	return fp;
   
-  for(i = 0; i < RARRAY(path)->len; i++) {
-	item = RARRAY(path)->ptr[i];
-	dir = STR2CSTR(item);
-	dir_len = RSTRING(item)->len;
+  for(i = 0; i < RARRAY_LEN(path); i++) {
+	item = RARRAY_PTR(path)[i];
+	dir = StringValuePtr(item);
+	dir_len = RSTRING_LEN(item);
 
 	if(strncmp(&dir[dir_len - 1], delimiter, 1) != 0) {
 	  total_len = dir_len + len + 2;




--- setup.rb.orig	2003-09-28 15:35:08.000000000 +0900
+++ setup.rb	2014-01-29 17:12:49.000000000 +0900
@@ -204,7 +204,7 @@
 
 class ConfigTable
 
-  c = ::Config::CONFIG
+  c = ::RbConfig::CONFIG
 
   rubypath = c['bindir'] + '/' + c['ruby_install_name']
 
@@ -787,7 +787,7 @@
         raise InstallError, "no ruby extention exists: 'ruby #{$0} setup' first"
   end
 
-  DLEXT = /\.#{ ::Config::CONFIG['DLEXT'] }\z/
+  DLEXT = /\.#{ ::RbConfig::CONFIG['DLEXT'] }\z/
 
   def _ruby_extentions( dir )
     Dir.open(dir) {|d|

Return to bug 186228

Line 0 Link Here

(-)files/patch-ext-ming-ming-ming.c (+28 lines)
	1	--- ext/ming/ming/ming.c.orig 2003-09-28 13:51:44.000000000 +0900
	2	+++ ext/ming/ming/ming.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -56,10 +56,10 @@
	4	{
	5	if(TYPE(c) != T_STRING)
	6	rb_raise(rb_eMingError, "Argument must be a character on keyboard.");
	7	- if(RSTRING(c)->len != 1)
	8	+ if(RSTRING_LEN(c) != 1)
	9	rb_raise(rb_eMingError, "Size of argument must be just 1.");
	10
	11	- return INT2FIX(SWFBUTTON_KEYPRESS(RSTRING(c)->ptr[0]));
	12	+ return INT2FIX(SWFBUTTON_KEYPRESS(RSTRING_PTR(c)[0]));
	13	}
	14
	15	static VALUE
	16	@@ -68,10 +68,10 @@
	17	{
	18	if(TYPE(c) != T_STRING)
	19	rb_raise(rb_eMingError, "Argument must be character on keyboard.");
	20	- if(RSTRING(c)->len != 1)
	21	+ if(RSTRING_LEN(c) != 1)
	22	rb_raise(rb_eMingError, "Size of argument must be just 1.");
	23
	24	- return INT2FIX(SWFBUTTON_ONKEYPRESS(RSTRING(c)->ptr[0]));
	25	+ return INT2FIX(SWFBUTTON_ONKEYPRESS(RSTRING_PTR(c)[0]));
	26	}
	27
	28	void rb_Ming_raise(char *msg, ...)

Line 0 Link Here

(-)files/patch-ext-ming-ming-swfbitmap.c (+27 lines)
	1	--- ext/ming/ming/swfbitmap.c.orig 2003-09-28 11:54:54.000000000 +0900
	2	+++ ext/ming/ming/swfbitmap.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -39,13 +39,13 @@
	4
	5	rb_scan_args(argc, argv, "11", &f, &a);
	6
	7	- filename = STR2CSTR(f);
	8	+ filename = StringValuePtr(f);
	9	fp = fopen(filename, "rb");
	10	if (fp == NULL)
	11	RAISE_NOF(filename);
	12
	13	if(NIL_P(a)) {
	14	- len = RSTRING(f)->len;
	15	+ len = RSTRING_LEN(f);
	16	if(len > 5) {
	17	ext = &filename[len - 5];
	18	if(strncmp_ignore_case(ext, ".jpeg", 5) == 0) {
	19	@@ -64,7 +64,7 @@
	20	}
	21	} else {
	22
	23	- alpha_filename = STR2CSTR(a);
	24	+ alpha_filename = StringValuePtr(a);
	25	afp = fopen(alpha_filename, "rb");
	26	if (afp == NULL) RAISE_NOF(alpha_filename);
	27

Line 0 Link Here

(-)files/patch-ext-ming-ming-swffont.c (+31 lines)
	1	--- ext/ming/ming/swffont.c.orig 2003-09-28 12:51:28.000000000 +0900
	2	+++ ext/ming/ming/swffont.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -44,16 +44,16 @@
	4	VALUE self, n;
	5	{
	6	struct RSWFFont *f = ALLOC(struct RSWFFont);
	7	- char name = STR2CSTR(n), ext;
	8	+ char name = StringValuePtr(n), ext;
	9	size_t len;
	10	FILE *fp;
	11	VALUE obj;
	12
	13	VALUE path = rb_cv_get(rb_cSWFFont, "@@font_path");
	14	- len = RSTRING(n)->len;
	15	+ len = RSTRING_LEN(n);
	16
	17	if(len > 4) {
	18	- ext = &name[RSTRING(n)->len - 4];
	19	+ ext = &name[RSTRING_LEN(n) - 4];
	20
	21	if (strncmp_ignore_case(ext, ".fdb", 4) == 0) {
	22	fp = search_file(path, name, "rb");
	23	@@ -92,7 +92,7 @@
	24
	25	Data_Get_Struct(self, struct RSWFFont, f);
	26
	27	- return rb_float_new(SWFFont_getStringWidth(f->this, STR2CSTR(s)));
	28	+ return rb_float_new(SWFFont_getStringWidth(f->this, StringValuePtr(s)));
	29	}
	30
	31	static VALUE

Line 0 Link Here

(-)files/patch-ext-ming-ming-swfmovie.c (+47 lines)
	1	--- ext/ming/ming/swfmovie.c.orig 2003-09-28 13:22:16.000000000 +0900
	2	+++ ext/ming/ming/swfmovie.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -108,7 +108,7 @@
	4	int count;
	5
	6	Data_Get_Struct(self, struct RSWFMovie, m);
	7	- count = SWFMovie_save(m->this, STR2CSTR(s));
	8	+ count = SWFMovie_save(m->this, StringValuePtr(s));
	9
	10	return INT2NUM(count);
	11	}
	12	@@ -226,7 +226,7 @@
	13	struct RSWFMovie *m;
	14
	15	Data_Get_Struct(self, struct RSWFMovie, m);
	16	- SWFMovie_labelFrame(m->this, STR2CSTR(label));
	17	+ SWFMovie_labelFrame(m->this, StringValuePtr(label));
	18
	19	return self;
	20	}
	21	@@ -248,7 +248,7 @@
	22	VALUE self, n;
	23	{
	24	struct RSWFMovie *m;
	25	- char *name = STR2CSTR(n);
	26	+ char *name = StringValuePtr(n);
	27	FILE *fp;
	28	VALUE path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
	29	#ifdef SUPPORT_PCM
	30	@@ -286,7 +286,7 @@
	31	Data_Get_Struct(block, struct RSWFBlock, b);
	32
	33	regist_references(m->table, n);
	34	- SWFMovie_addExport(m->this, b->this, STR2CSTR(n));
	35	+ SWFMovie_addExport(m->this, b->this, StringValuePtr(n));
	36
	37	return self;
	38	}
	39	@@ -331,7 +331,7 @@
	40	{
	41	struct RSWFMovie *m;
	42	struct RSWFDisplayItem *i;
	43	- char *name = STR2CSTR(n);
	44	+ char *name = StringValuePtr(n);
	45	FILE *fp;
	46	VALUE obj, path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
	47	SWFSound sound;

Line 0 Link Here

(-)files/patch-ext-ming-ming-swfmovieclip.c (+20 lines)
	1	--- ext/ming/ming/swfmovieclip.c.orig 2003-09-28 12:33:14.000000000 +0900
	2	+++ ext/ming/ming/swfmovieclip.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -135,7 +135,7 @@
	4
	5	Data_Get_Struct(self, struct RSWFMovieClip, m);
	6
	7	- SWFMovieClip_labelFrame(m->this, STR2CSTR(s));
	8	+ SWFMovieClip_labelFrame(m->this, StringValuePtr(s));
	9
	10	return self;
	11	}
	12	@@ -158,7 +158,7 @@
	13	VALUE self, n, r;
	14	{
	15	struct RSWFMovie *m;
	16	- char *name = STR2CSTR(n);
	17	+ char *name = StringValuePtr(n);
	18	FILE *fp;
	19	VALUE path = rb_cv_get(rb_cSWFMovie, "@@mp3_path");
	20	#ifdef SUPPORT_PCM

Line 0 Link Here

(-)files/patch-ext-ming-ming-swftext.c (+20 lines)
	1	--- ext/ming/ming/swftext.c.orig 2003-09-28 13:30:34.000000000 +0900
	2	+++ ext/ming/ming/swftext.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -143,7 +143,7 @@
	4
	5	Data_Get_Struct(self, struct RSWFText, p);
	6
	7	- SWFText_addString(p->this, STR2CSTR(s), NULL);
	8	+ SWFText_addString(p->this, StringValuePtr(s), NULL);
	9	return self;
	10	}
	11
	12	@@ -154,7 +154,7 @@
	13	struct RSWFText *p;
	14
	15	Data_Get_Struct(self, struct RSWFText, p);
	16	- return rb_float_new(SWFText_getStringWidth(p->this, STR2CSTR(s)));
	17	+ return rb_float_new(SWFText_getStringWidth(p->this, StringValuePtr(s)));
	18	}
	19
	20	static VALUE

Line 0 Link Here

(-)files/patch-ext-ming-ming-swftextfield.c (+20 lines)
	1	--- ext/ming/ming/swftextfield.c.orig 2003-09-28 12:01:42.000000000 +0900
	2	+++ ext/ming/ming/swftextfield.c 2014-01-29 17:11:21.000000000 +0900
	3	@@ -209,7 +209,7 @@
	4	struct RSWFTextField *t;
	5
	6	Data_Get_Struct(self, struct RSWFTextField, t);
	7	- SWFTextField_addString(t->this, STR2CSTR(s));
	8	+ SWFTextField_addString(t->this, StringValuePtr(s));
	9
	10	return self;
	11	}
	12	@@ -245,7 +245,7 @@
	13	struct RSWFTextField *t;
	14
	15	Data_Get_Struct(self, struct RSWFTextField, t);
	16	- SWFTextField_setVariableName(t->this, STR2CSTR(n));
	17	+ SWFTextField_setVariableName(t->this, StringValuePtr(n));
	18
	19	return self;
	20	}

Line 0 Link Here

(-)files/patch-ext-ming-ming-util.c (+17 lines)
	1	--- ext/ming/ming/util.c.orig 2003-09-28 13:30:20.000000000 +0900
	2	+++ ext/ming/ming/util.c 2014-01-29 17:11:17.000000000 +0900
	3	@@ -83,10 +83,10 @@
	4	if (fp != NULL)
	5	return fp;
	6
	7	- for(i = 0; i < RARRAY(path)->len; i++) {
	8	- item = RARRAY(path)->ptr[i];
	9	- dir = STR2CSTR(item);
	10	- dir_len = RSTRING(item)->len;
	11	+ for(i = 0; i < RARRAY_LEN(path); i++) {
	12	+ item = RARRAY_PTR(path)[i];
	13	+ dir = StringValuePtr(item);
	14	+ dir_len = RSTRING_LEN(item);
	15
	16	if(strncmp(&dir[dir_len - 1], delimiter, 1) != 0) {
	17	total_len = dir_len + len + 2;

Line 0 Link Here

(-)files/patch-setup.rb (+20 lines)
	1	--- setup.rb.orig 2003-09-28 15:35:08.000000000 +0900
	2	+++ setup.rb 2014-01-29 17:12:49.000000000 +0900
	3	@@ -204,7 +204,7 @@
	4
	5	class ConfigTable
	6
	7	- c = ::Config::CONFIG
	8	+ c = ::RbConfig::CONFIG
	9
	10	rubypath = c['bindir'] + '/' + c['ruby_install_name']
	11
	12	@@ -787,7 +787,7 @@
	13	raise InstallError, "no ruby extention exists: 'ruby #{$0} setup' first"
	14	end
	15
	16	- DLEXT = /\.#{ ::Config::CONFIG['DLEXT'] }\z/
	17	+ DLEXT = /\.#{ ::RbConfig::CONFIG['DLEXT'] }\z/
	18
	19	def _ruby_extentions( dir )
	20	Dir.open(dir) {\|d\|