Fixed compile error with xorg-x11. This closes bug #154196. Also fixed modular X dependency.

(Portage version: 2.1.1)

5 files changed, 69 insertions, 8 deletions

diff --git a/app-i18n/minichinput/ChangeLog b/app-i18n/minichinput/ChangeLog
index e8d323a55fb8..6479b8103b94 100644
--- a/app-i18n/minichinput/ChangeLog
+++ b/app-i18n/minichinput/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/minichinput
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/ChangeLog,v 1.3 2005/01/01 14:35:58 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/ChangeLog,v 1.4 2006/11/05 17:37:56 usata Exp $
+
+  05 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/minichinput-0.1.9-gcc4.patch,
+  +files/minichinput-0.1.9-xorg-x11.patch, minichinput-0.1.9.ebuild:
+  Fixed compile error with xorg-x11. This closes bug #154196.
+  Also fixed modular X dependency.
 
 *minichinput-0.1.9 (31 Aug 2003)
 
diff --git a/app-i18n/minichinput/files/digest-minichinput-0.1.9 b/app-i18n/minichinput/files/digest-minichinput-0.1.9
index 550e187f7728..6daef9c53279 100644
--- a/app-i18n/minichinput/files/digest-minichinput-0.1.9
+++ b/app-i18n/minichinput/files/digest-minichinput-0.1.9
@@ -1,2 +1,6 @@
-MD5 7c767a0ae9cfcd1c1f6bad3931386175 miniChinput-0.1.9.tar.gz 1631895
 MD5 75335d1556d37e4b943a511b6676b07c miniChinput-0.1.9-rxvt.patch 8606
+RMD160 2f3ec3de6f7bd80ae6e8aa1e27f502ce1ee9d4ca miniChinput-0.1.9-rxvt.patch 8606
+SHA256 aee83af616c76424346e987d28ffbef8b7b74525d55d206bf00747688d3e0436 miniChinput-0.1.9-rxvt.patch 8606
+MD5 7c767a0ae9cfcd1c1f6bad3931386175 miniChinput-0.1.9.tar.gz 1631895
+RMD160 cca0801fe5ea8c907c09e4e69ce26d0e0501ed00 miniChinput-0.1.9.tar.gz 1631895
+SHA256 ca82e264d979d4a66056208b4b09e0246856e126018ecc8bb6716e0e4b1b7b5c miniChinput-0.1.9.tar.gz 1631895
diff --git a/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch b/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch
new file mode 100644
index 000000000000..2472ecbd8075
--- /dev/null
+++ b/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch
@@ -0,0 +1,11 @@
+--- miniChinput-0.1.9/src/keyboard.c.orig	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/src/keyboard.c	2006-11-06 02:22:10.000000000 +0900
+@@ -24,7 +24,7 @@
+ #define INC (x0 += KEY_WIDTH)
+ #define HALFINC (x0 += KEY_WIDTH/2)
+ 
+-extern int ForwardEvent();
++extern int ForwardEvent(unsigned long, Boolean, Boolean, Boolean);
+ static void set_key(int n, unsigned long keysym, int x, int y, int w, int h);
+ static int in_keys(int x0, int y0);
+ 
diff --git a/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch b/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch
new file mode 100644
index 000000000000..b83ac739765b
--- /dev/null
+++ b/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch
@@ -0,0 +1,34 @@
+diff -urN miniChinput-0.1.9.orig/configure miniChinput-0.1.9/configure
+--- miniChinput-0.1.9.orig/configure	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/configure	2006-11-06 02:11:37.000000000 +0900
+@@ -3413,11 +3413,11 @@
+ 
+ # Check Xft related headers and libs.
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
++tmpar=`find /usr/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
+ TMP_XFT2=`echo "$tmpar"|grep Xft2`
+ TMP_XFT=`echo "$tmpar"|grep -v Xft2`
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name freetype.h | sed 's?/freetype/freetype.h??'`
++tmpar=`find /usr/include -name freetype.h | sed 's?/freetype/freetype.h??'`
+ TMP_FREE2=`echo "$tmpar"|grep freetype2`
+ TMP_FREE=`echo "$tmpar"|grep -v freetype2`
+ if test "x$TMP_XFT2" != "x" -a "x$TMP_FREE2" != "x"; then
+diff -urN miniChinput-0.1.9.orig/configure.in miniChinput-0.1.9/configure.in
+--- miniChinput-0.1.9.orig/configure.in	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/configure.in	2006-11-06 02:11:54.000000000 +0900
+@@ -45,11 +45,11 @@
+ 
+ # Check Xft related headers and libs.
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
++tmpar=`find /usr/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
+ TMP_XFT2=`echo "$tmpar"|grep Xft2`
+ TMP_XFT=`echo "$tmpar"|grep -v Xft2`
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name freetype.h | sed 's?/freetype/freetype.h??'`
++tmpar=`find /usr/include -name freetype.h | sed 's?/freetype/freetype.h??'`
+ TMP_FREE2=`echo "$tmpar"|grep freetype2`
+ TMP_FREE=`echo "$tmpar"|grep -v freetype2`
+ if test "x$TMP_XFT2" != "x" -a "x$TMP_FREE2" != "x"; then 
diff --git a/app-i18n/minichinput/minichinput-0.1.9.ebuild b/app-i18n/minichinput/minichinput-0.1.9.ebuild
index a69363a040c2..c4f94293e252 100644
--- a/app-i18n/minichinput/minichinput-0.1.9.ebuild
+++ b/app-i18n/minichinput/minichinput-0.1.9.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/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.6 2005/01/01 14:35:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.7 2006/11/05 17:37:56 usata Exp $
 
 inherit eutils
 
@@ -16,21 +16,27 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/xft
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+	|| ( x11-libs/libXft virtual/xft )
 	media-libs/fontconfig
 	>=media-libs/imlib-1.9.13
 	!app-i18n/chinput"
+RDEPEND="${DEPEND}
+	|| ( media-fonts/font-sony-misc virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	epatch ${DISTDIR}/${MY_P}-rxvt.patch
+	epatch ${FILESDIR}/${P}-xorg-x11.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {
-	econf || die "configure failed"
+	econf \
+		--x-includes=/usr/include \
+		--x-libraries=/usr/lib || die "configure failed"
 	emake || die "make failed"
 	emake data || die "make data failed"
 }