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
