diff options
| author | taca <taca@pkgsrc.org> | 2003-08-30 02:55:03 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2003-08-30 02:55:03 +0000 |
| commit | 40a6f2a4e2cb388d2d83be9326ff8a4d7adab2a1 (patch) | |
| tree | f140219b7be2402c0bbec2fe2d9041130a0b7149 /x11/ruby-fox/patches | |
| parent | 7c0ecfeefead93e86e6533cdefd4a25c095c0357 (diff) | |
| download | pkgsrc-40a6f2a4e2cb388d2d83be9326ff8a4d7adab2a1.tar.gz | |
update ruby-fox package to 1.0.25 based on patch by private mail
from Juan RP <xtraeme AT NetBSD DOT org>.
(I've only change PLIST and miscellaneous format of files.)
This package catch up to fox 1.0.43 and changes are vast, please refer
<http://www.fxruby.org/doc/changes.html> in detail.
Diffstat (limited to 'x11/ruby-fox/patches')
| -rw-r--r-- | x11/ruby-fox/patches/patch-aa | 24 | ||||
| -rw-r--r-- | x11/ruby-fox/patches/patch-ab | 34 |
2 files changed, 29 insertions, 29 deletions
diff --git a/x11/ruby-fox/patches/patch-aa b/x11/ruby-fox/patches/patch-aa index 60ed0f3c3a8..a0d2533acaa 100644 --- a/x11/ruby-fox/patches/patch-aa +++ b/x11/ruby-fox/patches/patch-aa @@ -1,21 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/05 17:24:31 sakamoto Exp $ +$NetBSD: patch-aa,v 1.2 2003/08/30 02:55:03 taca Exp $ ---- extconf.rb.orig Wed Jul 25 01:19:52 2001 -+++ extconf.rb -@@ -105,6 +105,7 @@ - $LOCAL_LIBS = $LOCAL_LIBS + "foxdll.lib" - else +--- extconf.rb.orig 2003-08-30 03:30:47.000000000 +0200 ++++ extconf.rb 2003-08-30 03:31:53.000000000 +0200 +@@ -115,7 +115,7 @@ + + def do_unix_setup $libs = append_library($libs, "stdc++") +-# $libs = append_library($libs, "supc++") + $libs = append_library($libs, "gcc") have_header("sys/time.h") + have_header("signal.h") have_library("png", "png_create_read_struct") - have_library("z", "deflate") -@@ -115,7 +116,7 @@ - find_library("GL", "glXCreateContext", "/usr/X11R6/lib") - find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib") - $libs = append_library($libs, "FOX") -- $CFLAGS = $CFLAGS + "-O0 -fno-strict-prototype -fpermissive -DSWIG_NOINCLUDE -Iinclude" -+ $CFLAGS = $CFLAGS + "-O0 -fno-strict-prototype -DSWIG_NOINCLUDE -Iinclude" - end - - # Last step: build the makefile diff --git a/x11/ruby-fox/patches/patch-ab b/x11/ruby-fox/patches/patch-ab index 7f154314e5b..27c9fba6d03 100644 --- a/x11/ruby-fox/patches/patch-ab +++ b/x11/ruby-fox/patches/patch-ab @@ -1,23 +1,31 @@ -$NetBSD: patch-ab,v 1.1 2002/01/26 03:50:35 taca Exp $ +$NetBSD: patch-ab,v 1.2 2003/08/30 02:55:03 taca Exp $ ---- FXRuby.cpp.orig Fri Jul 27 05:09:22 2001 -+++ FXRuby.cpp -@@ -74,6 +74,9 @@ +--- FXRuby.cpp.orig 2003-08-30 03:32:27.000000000 +0200 ++++ FXRuby.cpp 2003-08-30 03:34:48.000000000 +0200 +@@ -42,6 +42,9 @@ #include <io.h> // for get_osf_handle() #endif +#define RB_BPROC(func) ((VALUE (*)(...))func) +#define RB_RPROC(func) ((VALUE (*)(...))func) + - // Maps C++ objects to Ruby instances - static std::map<const void*,VALUE> FXRuby_ObjMap; + #ifdef HAVE_SIGNAL_H + #include <signal.h> // for definitions of SIGINT, etc. + #endif +@@ -1085,12 +1088,12 @@ -@@ -766,7 +769,7 @@ - hArgs.nargs=3; - VALUE retval; if(FXRbCatchExceptions){ -- retval=rb_rescue2(handle_body,(VALUE)&hArgs,handle_rescue,Qnil, -+ retval=rb_rescue2(RB_BPROC(handle_body),(VALUE)&hArgs,RB_RPROC(handle_rescue),Qnil, - rb_eStandardError,rb_eNameError,0); + #ifdef RB_RESCUE2_BROKEN_PROTOTYPE +- retval=rb_rescue2((VALUE(*)()) handle_body, reinterpret_cast<VALUE>(&hArgs), +- (VALUE(*)()) handle_rescue, Qnil, ++ retval=rb_rescue2((VALUE(*)()) RB_BPROC(handle_body), reinterpret_cast<VALUE>(&hArgs), ++ (VALUE(*)()) RB_RPROC(handle_rescue), Qnil, + rb_eStandardError, rb_eNameError, 0); + #else +- retval=rb_rescue2((VALUE(*)(ANYARGS)) handle_body, reinterpret_cast<VALUE>(&hArgs), +- (VALUE(*)(ANYARGS)) handle_rescue, Qnil, ++ retval=rb_rescue2((VALUE(*)(ANYARGS)) RB_BPROC(handle_body), reinterpret_cast<VALUE>(&hArgs), ++ (VALUE(*)(ANYARGS)) RB_RPROC(handle_rescue), Qnil, + rb_eStandardError, rb_eNameError, 0); + #endif } - else{ |