commit: c8186106910e089a73288876cca11b5c41787782
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 12:58:17 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 12:58:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8186106
app-i18n/im-freewnn: fix immodules path
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/im-freewnn/files/im-freewnn-gentoo.patch | 112 ++++++++++++++++++++++
app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild | 48 ++++++++++
2 files changed, 160 insertions(+)
diff --git a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
new file mode 100644
index 00000000000..90e042fc419
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
@@ -0,0 +1,112 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
++moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
+ ## Makefile.am for gtk+/modules/input
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -6,11 +6,11 @@
+
+ SUBDIRS = po
+
+-INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/wnn
-DIM_LOCALEDIR=\"${datadir}/locale\"
++INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
+
+ DEPS =
+
+-LDADDS = @GTK_DEP_LIBS@ -lcrypt
++LDADDS = @GTK_DEP_LIBS@
+
+ EXTRA_DIST= \
+ im-freewnn.spec
+@@ -38,7 +38,7 @@
+ candwin.h \
+ candwin.c
+
+-im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
++im_freewnn_la_LIBADD = $(LDADDS)
+
+ module_LTLIBRARIES = \
+ im-freewnn.la
+--- a/configure.in
++++ b/configure.in
+@@ -21,8 +21,10 @@
+
+ GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+ GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ AC_SUBST(GTK_DEP_CFLAGS)
+ AC_SUBST(GTK_DEP_LIBS)
++AC_SUBST(GTK_BINARY_VERSION)
+
+ LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+ LT_CURRENT=2
+@@ -48,11 +50,9 @@
+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
+ dnl FreeWnn check
+-ldflags_backup="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -lcrypt"
+ AC_CHECK_HEADER(wnn/jlib.h,,)
++AC_CHECK_LIB(crypt, crypt,,)
+ AC_CHECK_LIB(wnn, jl_open_lang,,)
+-LDFLAGS="$ldflags_backup"
+
+ AC_OUTPUT([
+ Makefile
+--- a/freewnn-modewin.h
++++ b/freewnn-modewin.h
+@@ -23,7 +23,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <jllib.h>
++#include <wnn/jllib.h>
+
+ #include "freewnn-register-win.h"
+ #include "freewnn-config.h"
+--- a/freewnn-register-win.c
++++ b/freewnn-register-win.c
+@@ -18,7 +18,7 @@
+ *
+ */
+
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <gtk/gtk.h>
+
+ #include <gdk/gdkkeysyms.h>
+--- a/freewnn-register-win.h
++++ b/freewnn-register-win.h
+@@ -22,7 +22,7 @@
+ #define _FREEWNN_REGIST_WIN
+
+ #include <gtk/gtk.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+
+ typedef struct _FreeWnnRegisterWin FreeWnnRegisterWin;
+
+--- a/freewnn-utils.h
++++ b/freewnn-utils.h
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <glib.h>
+
+ w_char* char2wchar(unsigned char* str);
+--- a/im-freewnn.h
++++ b/im-freewnn.h
+@@ -26,7 +26,7 @@
+
+ #include <gtk/gtk.h>
+ #include <gtk/gtkimmodule.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+
+ #include "freewnn-modewin.h"
+ #include "freewnn-utils.h"
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
new file mode 100644
index 00000000000..9057c74300c
--- /dev/null
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
+
+DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/";
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/freewnn
+ x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-wnnenvrc.patch
+)
+
+src_prepare() {
+ default
+ eprefixify ${PN}.c
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+ gnome2_query_immodules_gtk2
+}
