* [gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe/, app-i18n/tomoe/files/
@ 2017-08-05 14:47 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-08-05 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 07b233477e357598c0910816ace3855422a37a83
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 14:46:24 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 14:47:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b23347
app-i18n/tomoe: fix build with >=dev-lang/ruby-1.9
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/tomoe/files/tomoe-ruby19.patch | 84 +++++++++++++++++++++++++++++
app-i18n/tomoe/tomoe-0.6.0-r3.ebuild | 93 +++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+)
diff --git a/app-i18n/tomoe/files/tomoe-ruby19.patch b/app-i18n/tomoe/files/tomoe-ruby19.patch
new file mode 100644
index 00000000000..bca6aa807f0
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-ruby19.patch
@@ -0,0 +1,84 @@
+--- a/bindings/ruby/tomoe-rb-char.c
++++ b/bindings/ruby/tomoe-rb-char.c
+@@ -2,6 +2,10 @@
+
+ #define _SELF(obj) RVAL2TCHR(obj)
+
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++
+ static VALUE
+ tc_initialize(int argc, VALUE *argv, VALUE self)
+ {
+@@ -13,7 +17,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);
+--- a/macros/ruby.m4
++++ b/macros/ruby.m4
+@@ -28,13 +28,18 @@
+
+ changequote(<<, >>)
+ for var_name in archdir sitearchdir CFLAGS LIBRUBYARG libdir \
+- sitelibdir sitearchdir; do
+- rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"`
++ sitelibdir rubyhdrdir rubyarchhdrdir; do
++ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
+ eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+ done
+ changequote([, ])
+
+- RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
++ if test "x$rbconfig_rubyhdrdir" = "x"; then
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
++ else
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_rubyhdrdir "
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_rubyarchhdrdir "
++ fi
+ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir "
+ RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS "
+ RUBY_LIBS="$rbconfig_LIBRUBYARG"
+--- a/module/dict/tomoe-dict-ruby.c
++++ b/module/dict/tomoe-dict-ruby.c
+@@ -52,6 +52,13 @@
+ #define TOMOE_IS_DICT_RUBY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOMOE_TYPE_DICT_RUBY))
+ #define TOMOE_DICT_RUBY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), TOMOE_TYPE_DICT_RUBY, TomoeDictRubyClass))
+
++#ifndef RARRAY_LEN
++# define RARRAY_LEN(a) (RARRAY(a)->len)
++#endif
++#ifndef RARRAY_PTR
++# define RARRAY_PTR(a) (RARRAY(a)->ptr)
++#endif
++
+ enum {
+ PROP_0,
+ PROP_FILENAME,
+@@ -209,7 +216,7 @@
+ ruby_script (PACKAGE);
+ ruby_set_argv (1, argv);
+
+- if (RARRAY(rb_load_path)->len == 0) {
++ if (RARRAY_LEN(rb_load_path) == 0) {
+ ruby_init_loadpath ();
+ }
+ }
+@@ -405,10 +412,10 @@
+
+ rb_results = rb_funcall (dict->rb_dict, rb_intern ("search"),
+ 1, GOBJ2RVAL (query));
+- len = RARRAY (rb_results)->len;
++ len = RARRAY_LEN(rb_results);
+ for (i = len; i; i--) {
+ results = g_list_prepend (results,
+- RVAL2TCND (RARRAY (rb_results)->ptr[i]));
++ RVAL2TCND (RARRAY_PTR(rb_results)[i]));
+ }
+ return results;
+ }
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
new file mode 100644
index 00000000000..be597455715
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23"
+
+inherit autotools ltprune python-single-r1 ruby-single
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
+_ruby_set_globals() {
+ local ruby
+ for ruby in ${USE_RUBY}; do
+ RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
+ done
+ RUBY_USEDEP="${RUBY_USEDEP%,}"
+}
+_ruby_set_globals
+unset -f _ruby_set_globals
+
+RDEPEND="dev-libs/glib:2
+ hyperestraier? ( app-text/hyperestraier )
+ mysql? ( virtual/libmysqlclient )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )
+ ruby? (
+ ${RUBY_DEPS}
+ dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+ )
+ subversion? ( dev-vcs/subversion )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-export-symbols.patch
+ "${FILESDIR}"/${PN}-glib-2.32.patch
+ "${FILESDIR}"/${PN}-ruby19.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
+ -e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
+ configure.ac
+
+ sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local ruby
+ for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+ if use ruby_targets_${ruby}; then
+ break
+ fi
+ done
+
+ econf \
+ $(use_enable ruby dict-ruby) \
+ $(use_enable static-libs static) \
+ $(use_with python python "") \
+ $(use_with ruby ruby "$(type -p ${ruby})") \
+ --with-svn-include="${EPREFIX}"/usr/include \
+ --with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe/, app-i18n/tomoe/files/
@ 2017-08-05 14:47 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-08-05 14:47 UTC (permalink / raw
To: gentoo-commits
commit: ab890ba6828cd92b5efbd658c75d8782705d4989
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 14:35:36 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 14:47:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab890ba6
app-i18n/tomoe: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch | 24 ----------------------
...rt-symbols.patch => tomoe-export-symbols.patch} | 0
app-i18n/tomoe/files/tomoe-gentoo.patch | 22 ++++++++++++++++++++
...e-0.6.0-glib232.patch => tomoe-glib-2.32.patch} | 6 ------
app-i18n/tomoe/tomoe-0.6.0-r2.ebuild | 8 ++++----
5 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch b/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch
deleted file mode 100644
index 97ddc88f6ad..00000000000
--- a/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tomoe-0.6.0.orig/module/dict/Makefile.am tomoe-0.6.0/module/dict/Makefile.am
---- tomoe-0.6.0.orig/module/dict/Makefile.am 2007-06-18 10:35:40.000000000 +0900
-+++ tomoe-0.6.0/module/dict/Makefile.am 2011-05-26 08:47:24.279701286 +0900
-@@ -34,7 +34,7 @@
-
- LIBADD = $(TOMOE_LIBS) \
- $(top_builddir)/lib/libtomoe.la
--LDFLAGS = \
-+LDFLAGS += \
- -rpath $(dict_moduledir) -avoid-version -module \
- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
-
-diff -Naur tomoe-0.6.0.orig/module/recognizer/Makefile.am tomoe-0.6.0/module/recognizer/Makefile.am
---- tomoe-0.6.0.orig/module/recognizer/Makefile.am 2007-04-10 16:24:20.000000000 +0900
-+++ tomoe-0.6.0/module/recognizer/Makefile.am 2011-05-26 08:47:36.502740712 +0900
-@@ -23,7 +23,7 @@
- AM_CPPFLAGS =
- INCLUDES = $(TOMOE_CFLAGS)
-
--LDFLAGS = \
-+LDFLAGS += \
- -rpath $(recognizer_moduledir) -avoid-version -module \
- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
-
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-export-symbols.patch b/app-i18n/tomoe/files/tomoe-export-symbols.patch
similarity index 100%
rename from app-i18n/tomoe/files/tomoe-0.6.0-export-symbols.patch
rename to app-i18n/tomoe/files/tomoe-export-symbols.patch
diff --git a/app-i18n/tomoe/files/tomoe-gentoo.patch b/app-i18n/tomoe/files/tomoe-gentoo.patch
new file mode 100644
index 00000000000..92ed311a0a7
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-gentoo.patch
@@ -0,0 +1,22 @@
+--- a/module/dict/Makefile.am
++++ b/module/dict/Makefile.am
+@@ -34,7 +34,7 @@
+
+ LIBADD = $(TOMOE_LIBS) \
+ $(top_builddir)/lib/libtomoe.la
+-LDFLAGS = \
++AM_LDFLAGS = \
+ -rpath $(dict_moduledir) -avoid-version -module \
+ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
+
+--- a/module/recognizer/Makefile.am
++++ b/module/recognizer/Makefile.am
+@@ -23,7 +23,7 @@
+ AM_CPPFLAGS =
+ INCLUDES = $(TOMOE_CFLAGS)
+
+-LDFLAGS = \
++AM_LDFLAGS = \
+ -rpath $(recognizer_moduledir) -avoid-version -module \
+ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
+
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch b/app-i18n/tomoe/files/tomoe-glib-2.32.patch
similarity index 73%
rename from app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch
rename to app-i18n/tomoe/files/tomoe-glib-2.32.patch
index cf073d4d2cf..eb05ab8b8d5 100644
--- a/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch
+++ b/app-i18n/tomoe/files/tomoe-glib-2.32.patch
@@ -1,5 +1,3 @@
-diff --git a/lib/glib-compat-key-file.h b/lib/glib-compat-key-file.h
-index 6cae16b..1fb1490 100644
--- a/lib/glib-compat-key-file.h
+++ b/lib/glib-compat-key-file.h
@@ -51,7 +51,7 @@
@@ -11,8 +9,6 @@ index 6cae16b..1fb1490 100644
G_BEGIN_DECLS
-diff --git a/lib/glib-utils.h b/lib/glib-utils.h
-index 275c96c..7afca67 100644
--- a/lib/glib-utils.h
+++ b/lib/glib-utils.h
@@ -28,7 +28,7 @@
@@ -24,8 +20,6 @@ index 275c96c..7afca67 100644
#include <glib/gi18n-lib.h>
#include "glib-compat-file-utilities.h"
#include "glib-compat-key-file.h"
-diff --git a/lib/tomoe.c b/lib/tomoe.c
-index 8578c27..4534017 100644
--- a/lib/tomoe.c
+++ b/lib/tomoe.c
@@ -26,7 +26,7 @@
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
index ef2be9338d2..94c10714110 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -48,9 +48,9 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}/${P}-export-symbols.patch" \
- "${FILESDIR}/${P}-ldflags.patch" \
- "${FILESDIR}/${P}-glib232.patch"
+ "${FILESDIR}/${PN}-gentoo.patch" \
+ "${FILESDIR}/${PN}-export-symbols.patch" \
+ "${FILESDIR}/${PN}-glib-2.32.patch"
if ! use hyperestraier ; then
sed -i -e "s/use_est=yes/use_est=no/" configure.ac || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe/, app-i18n/tomoe/files/
@ 2020-10-02 17:45 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-10-02 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 0623ba1f0b28c7126996383d3320490bb5285729
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Sep 25 00:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 17:45:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0623ba1f
app-i18n/tomoe: Fix building with glibc 2.32.
Closes: https://bugs.gentoo.org/713210
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/tomoe/files/tomoe-glibc-2.32.patch | 11 +++++++++++
app-i18n/tomoe/tomoe-0.6.0-r6.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
new file mode 100644
index 00000000000..5d296cdcdd3
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
@@ -0,0 +1,11 @@
+--- /lib/tomoe-xml-parser.c
++++ /lib/tomoe-xml-parser.c
+@@ -441,7 +441,7 @@
+ f = fopen (filename, "rb");
+ if (!f) {
+ g_warning ("failed to open dictionary file %s: %s", filename,
+- sys_errlist[errno]);
++ strerror(errno));
+ }
+ g_return_val_if_fail (f, FALSE);
+
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index 00b0c32111b..ad6822db39c 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2006-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-export-symbols.patch
+ "${FILESDIR}"/${PN}-glibc-2.32.patch
"${FILESDIR}"/${PN}-glib-2.32.patch
"${FILESDIR}"/${PN}-ruby19.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-02 17:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-05 14:47 [gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe/, app-i18n/tomoe/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2020-10-02 17:45 Mike Gilbert
2017-08-05 14:47 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox