From 5e895b2538277c797b41995fe142f2b0007d0aa3 Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Sat, 5 Feb 2005 06:35:44 +0000 Subject: Added libtoolize --copy --force (bug #75569), and add a patch to fix compilation with gtk+-2.6 (bug #68257). Package-Manager: portage-2.0.51-r15 --- app-i18n/im-ja/ChangeLog | 7 ++++++- app-i18n/im-ja/Manifest | 5 +++-- app-i18n/im-ja/files/im-ja-1.2-gtk26.patch | 22 ++++++++++++++++++++++ app-i18n/im-ja/im-ja-1.2-r1.ebuild | 8 +++++++- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 app-i18n/im-ja/files/im-ja-1.2-gtk26.patch (limited to 'app-i18n/im-ja') 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 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 im-ja-1.2-r1.ebuild: Stable on sparc diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest index 8bb757f3551a..409c9488a2aa 100644 --- a/app-i18n/im-ja/Manifest +++ b/app-i18n/im-ja/Manifest @@ -1,8 +1,9 @@ -MD5 7f236298e4ed0d173f5bd3a3c6649e9b ChangeLog 5054 MD5 9bfbbed7aedb705bb2d664c036213661 im-ja-0.8.ebuild 1162 -MD5 42638c731348f7eead663abdcf96a948 im-ja-1.2-r1.ebuild 2460 +MD5 a3a8541d587e3b1af2fb535dece17050 ChangeLog 5265 MD5 671f19c098650f48f938aba3ce96efd5 metadata.xml 522 MD5 462bac20720c21edfe551264f8d4744b im-ja-1.2.ebuild 2205 +MD5 31eaeb35d1a3aab937796b270dba482f im-ja-1.2-r1.ebuild 2629 MD5 1a5a47abfb65885d8a267ee51b76bb91 files/digest-im-ja-0.8 61 MD5 d30a8eb5243225cdcf281d93311194dc files/digest-im-ja-1.2 61 MD5 3ab8f20388045bda688d16be32fa1cb9 files/digest-im-ja-1.2-r1 130 +MD5 f77bff8724589c3448942bdce8a18153 files/im-ja-1.2-gtk26.patch 872 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" -- cgit v1.2.3-65-gdbad