diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2006-11-05 16:36:07 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2006-11-05 16:36:07 +0000 |
| commit | 05ed710b5af086ed555b646760e0b81576439e1d (patch) | |
| tree | e0ae1b48d38b5ed79a78bb2f2c2da464716a0059 /dev-libs/wnn7sdk | |
| parent | Fix evdev compatibility with non-input-hotplug servers. (Bug #154075, Marien (diff) | |
| download | gentoo-2-05ed710b5af086ed555b646760e0b81576439e1d.tar.gz gentoo-2-05ed710b5af086ed555b646760e0b81576439e1d.tar.bz2 gentoo-2-05ed710b5af086ed555b646760e0b81576439e1d.zip | |
Fixed build error with gcc-4 and modular X dependencies. Thanks to Gilles Dartiguelongue <dartigug@esiee.fr>. This closes bug #148961.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-libs/wnn7sdk')
| -rw-r--r-- | dev-libs/wnn7sdk/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 | 2 | ||||
| -rw-r--r-- | dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch | 30 | ||||
| -rw-r--r-- | dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild | 12 |
4 files changed, 47 insertions, 6 deletions
diff --git a/dev-libs/wnn7sdk/ChangeLog b/dev-libs/wnn7sdk/ChangeLog index e1cd1cba617d..a5a161051e1b 100644 --- a/dev-libs/wnn7sdk/ChangeLog +++ b/dev-libs/wnn7sdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/wnn7sdk -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.2 2005/02/11 15:10:18 usata Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.3 2006/11/05 16:36:07 usata Exp $ + + 05 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> +files/wnn7sdk-gcc4.patch, + wnn7sdk-20011017.ebuild: + Fixed build error with gcc-4 and modular X dependencies. Thanks to Gilles + Dartiguelongue <dartigug@esiee.fr>. This closes bug #148961. 12 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> wnn7sdk-20011017.ebuild: Marked as stable. diff --git a/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 b/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 index 08750f2c09f8..0cc634c028fb 100644 --- a/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 +++ b/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 @@ -1 +1,3 @@ MD5 19b41bf2ef86d7f4cb889c7f689602fb Wnn7SDK.tgz 178403 +RMD160 73c82084f4e3d7c512e3e4fd25998085fa9bf6e2 Wnn7SDK.tgz 178403 +SHA256 725d2900707076a0aeb6f793e01e2deade45c28daf4a6a37049b48bb6a6e561a Wnn7SDK.tgz 178403 diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch new file mode 100644 index 000000000000..f97845f449f1 --- /dev/null +++ b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch @@ -0,0 +1,30 @@ +diff -urN Wnn/etc/bdic.c Wnn-gcc4/etc/bdic.c +--- Wnn/etc/bdic.c 2001-10-17 10:37:17.000000000 +0900 ++++ Wnn-gcc4/etc/bdic.c 2006-11-06 01:31:31.000000000 +0900 +@@ -177,6 +177,14 @@ + #define max(a, b) ((a < b)? b:a) + #endif + ++#ifdef WNN_CHECK_INODE ++static int change_file_uniq1(); ++#else ++#ifdef JS ++static int change_file_uniq1(); ++#endif ++#endif ++ + /*:::DOC_START + * + * Function Name: dic_fopen +diff -urN Wnn/jlib/jl.c Wnn-gcc4/jlib/jl.c +--- Wnn/jlib/jl.c 2001-10-17 10:37:17.000000000 +0900 ++++ Wnn-gcc4/jlib/jl.c 2006-11-06 01:33:13.000000000 +0900 +@@ -297,6 +297,8 @@ + static int insert_dai_or_ikeiji(); + static int jl_dic_save_all_e_body(); + ++static void jl_disconnect_if_server_dead_body_by_jsid(); ++ + static struct wnn_buf *jl_open_lang_core(); + static struct wnn_env *jl_connect_lang_core(); + diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild index 643e98b5c38b..38f57b5f5609 100644 --- a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild +++ b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.2 2005/02/11 15:10:18 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.3 2006/11/05 16:36:07 usata Exp $ inherit eutils @@ -15,8 +15,11 @@ KEYWORDS="x86" IUSE="" # x11 is required for imake -DEPEND="virtual/x11 - virtual/libc" +DEPEND="|| ( + x11-misc/imake + virtual/x11 + )" +RDEPEND="" S="${WORKDIR}/src" @@ -25,6 +28,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PN}-malloc.patch epatch ${FILESDIR}/${PN}-gentoo.patch + epatch ${FILESDIR}/${PN}-gcc4.patch } src_compile() { |