diff options
| author | Steve Wills <swills@FreeBSD.org> | 2011-08-11 23:42:24 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2011-08-11 23:42:24 +0000 |
| commit | 77deb46b4865e548ad149efa68e8ae2bed1196f5 (patch) | |
| tree | 92ac0a3b4690dc5776008c5fa1efdd4fefa5adc0 /japanese | |
| parent | 3304a6db7c272db269e9140d62975969d4323a15 (diff) | |
| download | ports-77deb46b4865e548ad149efa68e8ae2bed1196f5.tar.gz ports-77deb46b4865e548ad149efa68e8ae2bed1196f5.zip | |
- Fix build with Ruby 1.9
PR: ports/159150
Submitted by: swills (me)
Approved by: maintainer timeout (ume; >2 weeks)
Notes
Notes:
svn path=/head/; revision=279512
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/tomoe/Makefile | 7 | ||||
| -rw-r--r-- | japanese/tomoe/files/patch-bindings_ruby_tomoe-rb-char.c | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile index b3e85b49c2c8..4e673bea166e 100644 --- a/japanese/tomoe/Makefile +++ b/japanese/tomoe/Makefile @@ -106,7 +106,9 @@ CONFIGURE_ARGS+=--disable-unihan PLIST_SUB+= UNIHAN="@comment " .endif -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/ruby-${RUBY_VER} \ + -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \ PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \ pyexecdir=${PYTHON_SITELIBDIR} \ GMSGFMT="${LOCALBASE}/bin/msgfmt" @@ -117,7 +119,4 @@ post-extract: ${UNZIP_CMD} -qo ${DISTDIR}/Unihan.zip -d ${WRKSRC}/module/dict .endif -.if ${RUBY_VER} == 1.9 -BROKEN= does not work with ruby 1.9 -.endif .include <bsd.port.post.mk> diff --git a/japanese/tomoe/files/patch-bindings_ruby_tomoe-rb-char.c b/japanese/tomoe/files/patch-bindings_ruby_tomoe-rb-char.c new file mode 100644 index 000000000000..20f2f2ee7770 --- /dev/null +++ b/japanese/tomoe/files/patch-bindings_ruby_tomoe-rb-char.c @@ -0,0 +1,11 @@ +--- bindings/ruby/tomoe-rb-char.c.orig 2011-07-24 02:20:26.000000000 +0000 ++++ bindings/ruby/tomoe-rb-char.c 2011-07-24 02:22:22.000000000 +0000 +@@ -13,7 +13,7 @@ + if (NIL_P(xml)) { + chr = tomoe_char_new(); + } else { +- chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING(xml)->len); ++ chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING_LEN(xml)); + } + + G_INITIALIZE(self, chr); |