commit: d08229cddbe06ace4b777dd9c8f00651665c0e13 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sun Jul 23 12:52:01 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sun Jul 23 12:52:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08229cd
app-i18n/im-freewnn: update patches Package-Manager: Portage-2.3.6, Repoman-2.3.1 ...it-declaration.patch => im-freewnn-headers.patch} | 12 ++++++++---- app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch | 11 +++++++++++ .../im-freewnn/files/im-freewnn-wnnrc-gentoo.diff | 20 -------------------- app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild | 11 ++++++----- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-implicit-declaration.patch b/app-i18n/im-freewnn/files/im-freewnn-headers.patch similarity index 68% rename from app-i18n/im-freewnn/files/im-freewnn-0.0.2-implicit-declaration.patch rename to app-i18n/im-freewnn/files/im-freewnn-headers.patch index c52618924c9..290aee97bd8 100644 --- a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-implicit-declaration.patch +++ b/app-i18n/im-freewnn/files/im-freewnn-headers.patch @@ -1,5 +1,3 @@ -diff --git a/freewnn-utils.c b/freewnn-utils.c -index 3cf63b3..0e871d6 100644 --- a/freewnn-utils.c +++ b/freewnn-utils.c @@ -18,6 +18,9 @@ @@ -12,8 +10,6 @@ index 3cf63b3..0e871d6 100644 #include "freewnn-utils.h" #include "kata2hkata.h" -diff --git a/im-freewnn.c b/im-freewnn.c -index b56d63c..833582e 100644 --- a/im-freewnn.c +++ b/im-freewnn.c @@ -26,6 +26,7 @@ @@ -24,3 +20,11 @@ index b56d63c..833582e 100644 #include <string.h> #include "keytable.h" +@@ -33,6 +34,7 @@ + #include <gdk/gdkkeysyms.h> + + #include "im-freewnn-intl.h" ++#include "freewnn-utils-ui.h" + #include "convtable.h" + #include "im-freewnn.h" + diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch new file mode 100644 index 00000000000..6b3c7076990 --- /dev/null +++ b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch @@ -0,0 +1,11 @@ +--- a/im-freewnn.c ++++ b/im-freewnn.c +@@ -236,7 +236,7 @@ + return; + } + +- jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError); ++ jl_set_env_wnnrc(wenv, "@GENTOO_PORTAGE_EPREFIX@/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError); + + cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable); + cf->candwin = candwin_new(); diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnrc-gentoo.diff b/app-i18n/im-freewnn/files/im-freewnn-wnnrc-gentoo.diff deleted file mode 100644 index ae7d629edc2..00000000000 --- a/app-i18n/im-freewnn/files/im-freewnn-wnnrc-gentoo.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- im-freewnn.c 2004-08-05 09:47:08.000000000 +0900 -+++ im-freewnn.c-wnnrc 2004-08-05 21:55:50.540038392 +0900 -@@ -53,7 +53,7 @@ - { 0, NULL }, - }; - --static const gchar* ideos = " 、。,.・:;?!゛゜´`¨^ ̄_ヽヾゝゞ〃仝々〆〇ー―‐/\〜‖|…‥‘’“”()〔〕[]{}〈〉《》「」『』【】+−±×÷=≠<>≦≧∞∴♂♀°′″℃¥$¢£%#&*@§☆★○●◎◇∧∨¬⇒⇔∀∃∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬ʼn♯♭♪†‡¶◯ゎゐゑヮヰヱヴヵヶΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмнопрстуфхцчшщъыьэюя─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"; -+static const gchar* ideos = " 、。,.・:;?!゛゜´`¨^ ̄_ヽヾゝゞ〃仝々〆〇ー―‐/\??|…‥‘’“”()〔〕[]{}〈〉《》「」『』【】+?±×÷=≠<>≦≧∞∴♂♀°′″℃¥$??%#&*@§☆★○●◎◇∧∨?⇒⇔∀∃∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬ʼn♯♭♪†‡¶◯ゎゐゑヮヰヱヴヵヶΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмнопрстуфхцчшщъыьэюя─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"; - - #ifdef BUFSIZ - #undef BUFSIZ -@@ -236,7 +236,7 @@ - return; - } - -- jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError); -+ jl_set_env_wnnrc(wenv, "/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError); - - cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable); - cf->candwin = candwin_new(); diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild index ecb37772d3c..5c50e7d3cc4 100644 --- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild +++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils gnome2-utils multilib +inherit autotools eutils gnome2-utils multilib prefix DESCRIPTION="Japanese FreeWnn input method module for GTK+2" HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/" @@ -30,12 +30,13 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-wnnrc-gentoo.diff" + epatch "${FILESDIR}"/${PN}-wnnenvrc.patch # bug #298744 epatch "${FILESDIR}/${P}-as-needed.patch" - epatch "${FILESDIR}/${P}-implicit-declaration.patch" + epatch "${FILESDIR}"/${PN}-headers.patch + eprefixify ${PN}.c - mv configure.in configure.ac || die + mv configure.{in,ac} || die eautoreconf }