diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2005-02-05 06:35:44 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2005-02-05 06:35:44 +0000 |
| commit | 940d84a772267677241aaf8628296112792a1860 (patch) | |
| tree | 56c0fa02c18eb4ccc4b1e459d0f7a2003f35fd60 /app-i18n | |
| parent | Change config check to check for BLK_DEV_LOOP not set as in documentation, th... (diff) | |
| download | gentoo-2-940d84a772267677241aaf8628296112792a1860.tar.gz gentoo-2-940d84a772267677241aaf8628296112792a1860.tar.bz2 gentoo-2-940d84a772267677241aaf8628296112792a1860.zip | |
Added libtoolize --copy --force (bug #75569), and add a patch to fix compilation with gtk+-2.6 (bug #68257).
(Portage version: 2.0.51-r15)
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/im-ja/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/im-ja/files/im-ja-1.2-gtk26.patch | 22 | ||||
| -rw-r--r-- | app-i18n/im-ja/im-ja-1.2-r1.ebuild | 8 |
3 files changed, 35 insertions, 2 deletions
diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog index beb8e8c2bf56..d78a488dc068 100644 --- a/app-i18n/im-ja/ChangeLog +++ b/app-i18n/im-ja/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-i18n/im-ja # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.34 2005/01/01 14:30:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.35 2005/02/05 06:35:44 usata Exp $ + + 05 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> im-ja-1.2-r1.ebuild, + +files/im-ja-1.2-gtk26.patch: + Added libtoolize --copy --force (bug #75569), and add a patch to fix + compilation with gtk+-2.6 (bug #68257). 16 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> im-ja-1.2-r1.ebuild: Stable on sparc diff --git a/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch b/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch new file mode 100644 index 000000000000..11ef62f4921b --- /dev/null +++ b/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch @@ -0,0 +1,22 @@ +--- im-ja/im-ja/src/gtk/im-ja-gtk.c 2004/06/25 08:57:18 1.7 ++++ im-ja/im-ja/src/gtk/im-ja-gtk.c 2004/12/09 13:07:09 1.8 +@@ -37,8 +37,8 @@ + #include "../actionmenu.h" + + extern GType gtk_im_module_get_type(void); +-#define GTK_TYPE_IM_MODULE (gtk_im_module_get_type()) +-#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST((im_module), GTK_TYPE_IM_MODULE, GtkIMModule)) ++/*#define GTK_TYPE_IM_MODULE (gtk_im_module_get_type())*/ ++/*#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))*/ + + IMJAConfig cfg; + gint notify_id = 0; +@@ -429,7 +429,7 @@ + GtkIMModule *im_module; + IM_JA_DEBUG("im_module_init()\n"); + +- im_module = GTK_IM_MODULE(module); ++ im_module = module; + g_module_make_resident(im_module->library); /*FIXME: This is only a workaround for the GConf bug */ + + im_ja_gtk_register_type(module); diff --git a/app-i18n/im-ja/im-ja-1.2-r1.ebuild b/app-i18n/im-ja/im-ja-1.2-r1.ebuild index 482efead83a4..87bb975df778 100644 --- a/app-i18n/im-ja/im-ja-1.2-r1.ebuild +++ b/app-i18n/im-ja/im-ja-1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.2-r1.ebuild,v 1.5 2005/01/01 14:30:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.2-r1.ebuild,v 1.6 2005/02/05 06:35:44 usata Exp $ inherit gnome2 eutils @@ -19,6 +19,8 @@ IUSE="gnome canna freewnn skk anthy" DEPEND="dev-lang/perl dev-perl/URI + >=sys-devel/autoconf-2.50 + >=sys-devel/automake-1.7 ${RDEPEND}" RDEPEND="virtual/libc >=dev-libs/glib-2.4 @@ -39,6 +41,9 @@ src_unpack() { unpack ${P}.tar.gz cd ${S} epatch ${DISTDIR}/${P}-20041001.diff.gz + if has_version '>=x11-libs/gtk+-2.6' ; then + epatch ${FILESDIR}/${P}-gtk26.patch + fi } src_compile() { @@ -53,6 +58,7 @@ src_compile() { use skk || myconf="$myconf --disable-skk" #use debug && myconf="$myconf --enable-debug" + libtoolize --copy --force || die # gnome2_src_compile automatically sets debug IUSE flag econf $myconf || die "econf im-ja failed" emake || die "emake im-ja failed" |