1 |
commit: ab890ba6828cd92b5efbd658c75d8782705d4989 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 5 14:35:36 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 5 14:47:31 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab890ba6 |
7 |
|
8 |
app-i18n/tomoe: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch | 24 ---------------------- |
13 |
...rt-symbols.patch => tomoe-export-symbols.patch} | 0 |
14 |
app-i18n/tomoe/files/tomoe-gentoo.patch | 22 ++++++++++++++++++++ |
15 |
...e-0.6.0-glib232.patch => tomoe-glib-2.32.patch} | 6 ------ |
16 |
app-i18n/tomoe/tomoe-0.6.0-r2.ebuild | 8 ++++---- |
17 |
5 files changed, 26 insertions(+), 34 deletions(-) |
18 |
|
19 |
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch b/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch |
20 |
deleted file mode 100644 |
21 |
index 97ddc88f6ad..00000000000 |
22 |
--- a/app-i18n/tomoe/files/tomoe-0.6.0-ldflags.patch |
23 |
+++ /dev/null |
24 |
@@ -1,24 +0,0 @@ |
25 |
-diff -Naur tomoe-0.6.0.orig/module/dict/Makefile.am tomoe-0.6.0/module/dict/Makefile.am |
26 |
---- tomoe-0.6.0.orig/module/dict/Makefile.am 2007-06-18 10:35:40.000000000 +0900 |
27 |
-+++ tomoe-0.6.0/module/dict/Makefile.am 2011-05-26 08:47:24.279701286 +0900 |
28 |
-@@ -34,7 +34,7 @@ |
29 |
- |
30 |
- LIBADD = $(TOMOE_LIBS) \ |
31 |
- $(top_builddir)/lib/libtomoe.la |
32 |
--LDFLAGS = \ |
33 |
-+LDFLAGS += \ |
34 |
- -rpath $(dict_moduledir) -avoid-version -module \ |
35 |
- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) |
36 |
- |
37 |
-diff -Naur tomoe-0.6.0.orig/module/recognizer/Makefile.am tomoe-0.6.0/module/recognizer/Makefile.am |
38 |
---- tomoe-0.6.0.orig/module/recognizer/Makefile.am 2007-04-10 16:24:20.000000000 +0900 |
39 |
-+++ tomoe-0.6.0/module/recognizer/Makefile.am 2011-05-26 08:47:36.502740712 +0900 |
40 |
-@@ -23,7 +23,7 @@ |
41 |
- AM_CPPFLAGS = |
42 |
- INCLUDES = $(TOMOE_CFLAGS) |
43 |
- |
44 |
--LDFLAGS = \ |
45 |
-+LDFLAGS += \ |
46 |
- -rpath $(recognizer_moduledir) -avoid-version -module \ |
47 |
- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) |
48 |
- |
49 |
|
50 |
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-export-symbols.patch b/app-i18n/tomoe/files/tomoe-export-symbols.patch |
51 |
similarity index 100% |
52 |
rename from app-i18n/tomoe/files/tomoe-0.6.0-export-symbols.patch |
53 |
rename to app-i18n/tomoe/files/tomoe-export-symbols.patch |
54 |
|
55 |
diff --git a/app-i18n/tomoe/files/tomoe-gentoo.patch b/app-i18n/tomoe/files/tomoe-gentoo.patch |
56 |
new file mode 100644 |
57 |
index 00000000000..92ed311a0a7 |
58 |
--- /dev/null |
59 |
+++ b/app-i18n/tomoe/files/tomoe-gentoo.patch |
60 |
@@ -0,0 +1,22 @@ |
61 |
+--- a/module/dict/Makefile.am |
62 |
++++ b/module/dict/Makefile.am |
63 |
+@@ -34,7 +34,7 @@ |
64 |
+ |
65 |
+ LIBADD = $(TOMOE_LIBS) \ |
66 |
+ $(top_builddir)/lib/libtomoe.la |
67 |
+-LDFLAGS = \ |
68 |
++AM_LDFLAGS = \ |
69 |
+ -rpath $(dict_moduledir) -avoid-version -module \ |
70 |
+ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) |
71 |
+ |
72 |
+--- a/module/recognizer/Makefile.am |
73 |
++++ b/module/recognizer/Makefile.am |
74 |
+@@ -23,7 +23,7 @@ |
75 |
+ AM_CPPFLAGS = |
76 |
+ INCLUDES = $(TOMOE_CFLAGS) |
77 |
+ |
78 |
+-LDFLAGS = \ |
79 |
++AM_LDFLAGS = \ |
80 |
+ -rpath $(recognizer_moduledir) -avoid-version -module \ |
81 |
+ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) |
82 |
+ |
83 |
|
84 |
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch b/app-i18n/tomoe/files/tomoe-glib-2.32.patch |
85 |
similarity index 73% |
86 |
rename from app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch |
87 |
rename to app-i18n/tomoe/files/tomoe-glib-2.32.patch |
88 |
index cf073d4d2cf..eb05ab8b8d5 100644 |
89 |
--- a/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch |
90 |
+++ b/app-i18n/tomoe/files/tomoe-glib-2.32.patch |
91 |
@@ -1,5 +1,3 @@ |
92 |
-diff --git a/lib/glib-compat-key-file.h b/lib/glib-compat-key-file.h |
93 |
-index 6cae16b..1fb1490 100644 |
94 |
--- a/lib/glib-compat-key-file.h |
95 |
+++ b/lib/glib-compat-key-file.h |
96 |
@@ -51,7 +51,7 @@ |
97 |
@@ -11,8 +9,6 @@ index 6cae16b..1fb1490 100644 |
98 |
|
99 |
G_BEGIN_DECLS |
100 |
|
101 |
-diff --git a/lib/glib-utils.h b/lib/glib-utils.h |
102 |
-index 275c96c..7afca67 100644 |
103 |
--- a/lib/glib-utils.h |
104 |
+++ b/lib/glib-utils.h |
105 |
@@ -28,7 +28,7 @@ |
106 |
@@ -24,8 +20,6 @@ index 275c96c..7afca67 100644 |
107 |
#include <glib/gi18n-lib.h> |
108 |
#include "glib-compat-file-utilities.h" |
109 |
#include "glib-compat-key-file.h" |
110 |
-diff --git a/lib/tomoe.c b/lib/tomoe.c |
111 |
-index 8578c27..4534017 100644 |
112 |
--- a/lib/tomoe.c |
113 |
+++ b/lib/tomoe.c |
114 |
@@ -26,7 +26,7 @@ |
115 |
|
116 |
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild |
117 |
index ef2be9338d2..94c10714110 100644 |
118 |
--- a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild |
119 |
+++ b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild |
120 |
@@ -1,4 +1,4 @@ |
121 |
-# Copyright 1999-2016 Gentoo Foundation |
122 |
+# Copyright 1999-2017 Gentoo Foundation |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
|
125 |
EAPI=5 |
126 |
@@ -48,9 +48,9 @@ pkg_setup() { |
127 |
|
128 |
src_prepare() { |
129 |
epatch \ |
130 |
- "${FILESDIR}/${P}-export-symbols.patch" \ |
131 |
- "${FILESDIR}/${P}-ldflags.patch" \ |
132 |
- "${FILESDIR}/${P}-glib232.patch" |
133 |
+ "${FILESDIR}/${PN}-gentoo.patch" \ |
134 |
+ "${FILESDIR}/${PN}-export-symbols.patch" \ |
135 |
+ "${FILESDIR}/${PN}-glib-2.32.patch" |
136 |
|
137 |
if ! use hyperestraier ; then |
138 |
sed -i -e "s/use_est=yes/use_est=no/" configure.ac || die |