[DRE-commits] [SCM] ruby-mecab.git branch, master, updated. debian/0.99.3-1-4-gf1077cc

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 82f422fba8bb1cacf94d55c2bc19e7a229e4cf0c
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Wed Jun 27 21:43:40 2012 +0900

    fix ftbfs

diff --git a/debian/changelog b/debian/changelog
index b23691b..c181c5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-mecab (0.99.3-2) UNRELEASED; urgency=low
+
+  * debian/patches/ftbfs-use-swig2.patch: Fix FTBFS (Closes: #676203)
+
+ -- TANIGUCHI Takaki <takaki at debian.org>  Wed, 27 Jun 2012 21:42:43 +0900
+
 ruby-mecab (0.99.3-1) unstable; urgency=low
 
   [ Cédric Boutillier ]
diff --git a/debian/patches/ftbfs-use-swig2.patch b/debian/patches/ftbfs-use-swig2.patch
new file mode 100644
index 0000000..a526ed9
--- /dev/null
+++ b/debian/patches/ftbfs-use-swig2.patch
@@ -0,0 +1,74 @@
+From: Artur Rona <ari-tczew at tlen.pl>
+Description: Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which breaks using rb_intern as an lvalue, as SWIG does. We work around this issue for now by disabling this.
+Bug: https://sourceforge.net/tracker/?func=detail&aid=2859614&group_id=1645&atid=101645
+Bug-Debian: http://bugs.debian.org/676203
+Origin: upstream, http://code.google.com/p/mecab/source/diff?spec=svn112&old=91&r=112&format=unidiff&path=%2Ftrunk%2Fmecab%2Fruby%2FMeCab_wrap.cpp
+
+diff -pruN -x '*~' mecab-ruby-0.993.orig/MeCab_wrap.cpp mecab-ruby-0.993/MeCab_wrap.cpp
+--- mecab-ruby-0.993.orig/MeCab_wrap.cpp	2012-02-10 17:46:45.000000000 +0100
++++ mecab-ruby-0.993/MeCab_wrap.cpp	2012-06-19 22:26:36.000000000 +0200
+@@ -854,6 +854,10 @@ SWIG_UnpackDataName(const char *c, void
+ 
+ 
+ #include <ruby.h>
++ 
++#ifdef rb_intern
++# undef rb_intern
++#endif
+ 
+ /* Remove global macros defined in Ruby's win32.h */
+ #ifdef write
+@@ -1402,7 +1406,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VAL
+ /* Error manipulation */
+ 
+ #define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)               
+-#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), msg)
++#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
+ #define SWIG_fail                        		goto fail				 
+ 
+ 
+@@ -1457,7 +1461,7 @@ static ID swig_call_id  = 0;
+       ++swig_virtual_calls;
+ #  define SWIG_RELEASE_STACK --swig_virtual_calls;
+ #  define Ruby_DirectorTypeMismatchException(x) \
+-          rb_raise( rb_eTypeError, x ); return c_result;
++          rb_raise( rb_eTypeError, "%s", x ); return c_result;
+ 
+       static unsigned int swig_virtual_calls = 0;
+ 
+@@ -1838,7 +1842,7 @@ static VALUE mMeCab;
+ #define SWIG_RUBY_THREAD_END_BLOCK
+ 
+ 
+-#define SWIGVERSION 0x010340 
++#define SWIGVERSION 0x020004
+ #define SWIG_VERSION SWIGVERSION
+ 
+ 
+@@ -2000,7 +2004,7 @@ SWIG_ruby_failed(void)
+ } 
+ 
+ 
+-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
++/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+ SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
+ {
+   VALUE obj = args[0];
+@@ -2076,7 +2080,7 @@ SWIG_From_bool  (bool value)
+ }
+ 
+ 
+-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
++/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
+ {
+   VALUE obj = args[0];
+@@ -2122,7 +2126,7 @@ SWIG_From_size_t  (size_t value)
+ }
+ 
+ 
+-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
++/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+ {
+   VALUE obj = args[0];
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..597738d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ftbfs-use-swig2.patch

-- 
ruby-mecab.git