From e7452e8cff76375fb02d84ef1364da9ec262ede2 Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Sat, 21 Aug 2004 20:08:32 +0000 Subject: Updated immodule for Qt patch (same as the last commit). --- x11-libs/qt/ChangeLog | 7 +++- x11-libs/qt/Manifest | 6 +-- x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch | 40 ++++++++++++++++++++ ...3-complemental-patch-for-immodule-20040814.diff | 44 ---------------------- x11-libs/qt/qt-3.3.2.ebuild | 37 +++++++++++++++--- 5 files changed, 80 insertions(+), 54 deletions(-) create mode 100644 x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch delete mode 100644 x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff (limited to 'x11-libs') 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 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 qt-3.3.3.ebuild: Updated immodule for Qt patch (fixes plugins/input path). diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 8c3432e4f013..abbfe443db37 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,9 +1,9 @@ -MD5 5f3c6e30ffd00c8095c037025f0cc56f ChangeLog 28118 +MD5 6aa3144503a7bc4b1d9f726f3ae47f0a ChangeLog 28352 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 c167f38f82d95bc8e7414bf15cbd693b qt-2.3.2-r1.ebuild 2282 MD5 3dc117d667771d6bd5a766379d5487b4 qt-3.2.3-r1.ebuild 5119 MD5 d9b8b0e6b856cf46205585912768c2dd qt-3.3.3.ebuild 6680 -MD5 5f539851259b611a9de911512108113d qt-3.3.2.ebuild 5940 +MD5 b83909322f8f81e54f4e183a991f6e61 qt-3.3.2.ebuild 6923 MD5 c31b58bb9bef0cf4b24823c9c7ce4d56 qt-3.3.1-r2.ebuild 5733 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72 MD5 ab6a47187e18bb5504032e8bae9d6ac0 files/digest-qt-3.3.3 252 @@ -18,7 +18,7 @@ MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688 -MD5 d3332b4021dc429eb3655d646eda7e9e files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff 1975 +MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72 MD5 5fa847107fbfecae865fe8b9e6f79097 files/digest-qt-3.3.2 252 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 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="!