Updated immodule for Qt patch (same as the last commit).

4 files changed, 77 insertions, 51 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 17089c337033..bdf9c4728044 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.168 2004/08/21 18:48:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.169 2004/08/21 20:08:32 usata Exp $
+
+  22 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.2.ebuild,
+  +files/qt-3.3.2-immodule-20040819.patch,
+  -files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff:
+  Updated immodule for Qt patch (same as the last commit).
 
   22 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.3.ebuild:
   Updated immodule for Qt patch (fixes plugins/input path).
diff --git a/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch b/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch
new file mode 100644
index 000000000000..d377c5436e25
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch
@@ -0,0 +1,40 @@
+Index: src/kernel/qapplication_x11.cpp
+===================================================================
+--- src/kernel/qapplication_x11.cpp	(.../vendor/qt-x11-free)	(revision 92)
++++ src/kernel/qapplication_x11.cpp	(.../immodule-qt-x11/trunk)	(revision 92)
+@@ -1026,13 +1057,31 @@
+ 	settings.readEntry( "/qt/XIMInputStyle",
+ 			    QObject::trUtf8( "On The Spot" ) ).lower();
+     if ( ximInputStyle == "on the spot" )
+-	xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
++	qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
+     else if ( ximInputStyle == "over the spot" )
+-	xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
++	qt_xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
+     else if ( ximInputStyle == "off the spot" )
+-	xim_preferred_style = XIMPreeditArea | XIMStatusArea;
++	qt_xim_preferred_style = XIMPreeditArea | XIMStatusArea;
+     else if ( ximInputStyle == "root" )
+-	xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
++	qt_xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
++
++    /*
++	The identifier name of an input method is acquired from the
++	configuration file as a default. If a environment variable
++	"QT_IM_SWITCHER" is not empty it will overwrite the
++	configuration file. The "imsw-multi" becomes the default if the entry
++	is not configured.
++     */
++    if ( getenv( "QT_IM_SWITCHER" ) )
++        defaultIM = getenv( "QT_IM_SWITCHER" );
++    else
++        defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" );
++
++    // defaultIM is restricted to be an IM-switcher. An IM-switcher
++    // has a 'imsw-' prefix
++    if ( defaultIM.find( "imsw-" ) != 0 ) {
++	defaultIM = "imsw-multi";
++    }
+ #endif
+ 
+     if (update_timestamp) {
diff --git a/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff b/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff
deleted file mode 100644
index 66dd57541c9d..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig	Thu Aug  5 23:42:03 2004
-+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp	Sat Aug 14 16:41:54 2004
-@@ -1026,18 +1026,36 @@
-     	settings.readBoolEntry("/qt/useRtlExtensions", FALSE);
- 
- #ifndef QT_NO_XIM
--    if (xim_preferred_style == 0) {
-+    if (qt_xim_preferred_style == 0) {
-         QString ximInputStyle =
-             settings.readEntry( "/qt/XIMInputStyle",
-                                 QObject::trUtf8( "On The Spot" ) ).lower();
-         if ( ximInputStyle == "on the spot" )
--            xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
-+            qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
-         else if ( ximInputStyle == "over the spot" )
--            xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
-+            qt_xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
-         else if ( ximInputStyle == "off the spot" )
--            xim_preferred_style = XIMPreeditArea | XIMStatusArea;
-+            qt_xim_preferred_style = XIMPreeditArea | XIMStatusArea;
-         else if ( ximInputStyle == "root" )
--            xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
-+            qt_xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
-+    }
-+ 
-+    /*
-+	The identifier name of an input method is acquired from the
-+	configuration file as a default. If a environment variable
-+	"QT_IM_SWITCHER" is not empty it will overwrite the
-+	configuration file. The "imsw-multi" becomes the default if the entry
-+	is not configured.
-+     */
-+    if ( getenv( "QT_IM_SWITCHER" ) )
-+        defaultIM = getenv( "QT_IM_SWITCHER" );
-+    else
-+        defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" );
-+
-+    // defaultIM is restricted to be an IM-switcher. An IM-switcher
-+    // has a 'imsw-' prefix
-+    if ( defaultIM.find( "imsw-" ) != 0 ) {
-+	defaultIM = "imsw-multi";
-     }
- #endif
- 
diff --git a/x11-libs/qt/qt-3.3.2.ebuild b/x11-libs/qt/qt-3.3.2.ebuild
index 0f1348b45d37..700b431ea8d9 100644
--- a/x11-libs/qt/qt-3.3.2.ebuild
+++ b/x11-libs/qt/qt-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.16 2004/08/20 16:14:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.17 2004/08/21 20:08:32 usata Exp $
 
 inherit eutils
 
@@ -9,14 +9,20 @@ DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 
 IMMQT_P="qt-x11-immodule-unified-qt3.3.2-20040814"
+IMMQT_P2="qt-3.3.3-immodule-20040814-20040819"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
+	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz
+		mirror://gentoo/${IMMQT_P2}.diff.gz
+		http://dev.gentoo.org/~usata/distfiles/${IMMQT_P2}.diff.gz )
+	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz
+		mirror://gentoo/${IMMQT_P2}.diff.gz
+		http://dev.gentoo.org/~usata/distfiles/${IMMQT_P2}.diff.gz )"
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
 KEYWORDS="x86 alpha ppc amd64 sparc hppa ~mips ppc64"
-IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt-bc"
+IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
 	media-libs/libpng media-libs/jpeg media-libs/libmng
@@ -33,7 +39,10 @@ DEPEND="virtual/x11 virtual/xft
 	zlib? ( sys-libs/zlib )
 	icc? ( dev-lang/icc )"
 
-RDEPEND="${DEPEND}"
+# old immodules may cause segfaults on some qt applications,
+# especially qtconfig
+PDEPEND="!<app-i18n/scim-qtimm-0.6_pre20040813
+	!<app-i18n/uim-qt-0.1.6_p20040815"
 
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
@@ -41,6 +50,16 @@ QTBASE=/usr/qt/3
 export QTDIR=${S}
 export PLATFORM=linux-g++
 
+pkg_setup() {
+	if use immqt ; then
+		ewarn
+		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+		ewarn "you have to recompile everything depending on Qt after you install it."
+		ewarn "Be aware."
+		ewarn
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -52,8 +71,13 @@ src_unpack() {
 
 	epatch ${FILESDIR}/qt-no-rpath-uic.patch
 
-	if use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
+	if use immqt || use immqt-bc ; then
+		pushd ..
+		epatch ${IMMQT_P2}.diff
+		popd
+		einfo "Applying ${IMMQT_P}.... Please ignore an error on qapplication_x11.cpp."
+		patch -p0 -g0 -s < ../${IMMQT_P}.diff
+		patch -p0 -g0 -s < ${FILESDIR}/qt-3.3.2-immodule-20040819.patch
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi
 
@@ -88,6 +112,7 @@ src_compile() {
 	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
 	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
 	use immqt-bc	&& myconf="${myconf} -im"
+	use immqt	&& myconf="${myconf} -im -im-ext"
 
 	export YACC='byacc -d'