Backport patch from upstream, fixing a regression with shortcuts and non-Engish keyboard layouts, wrt bug #477796.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 261 insertions, 9 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index d153f1c3f46b..cfe716dc56f3 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.6 2013/08/27 15:52:30 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.7 2013/09/23 14:39:21 kensington Exp $
+
+*qtgui-4.8.5-r1 (23 Sep 2013)
+
+  23 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/qtgui-4.8.5-keyboard-shortcuts.patch, +qtgui-4.8.5-r1.ebuild:
+  Backport patch from upstream, fixing a regression with shortcuts and non-
+  Engish keyboard layouts, wrt bug #477796.
 
   27 Aug 2013; Michael Palimaka <kensington@gentoo.org> qtgui-4.8.4-r1.ebuild,
   qtgui-4.8.5.ebuild:
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 1380a6bcdb23..b16c82463c1a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -3,20 +3,22 @@ Hash: SHA256
 
 AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9
 AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
+AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtgui-4.8.4-r1.ebuild 7213 SHA256 acd016b867ab1a37a4ea62e156277e2cbb618e22bf658a7f82ce2f3f1d2b6684 SHA512 67125c1bc35aa87f7f2806b4d4c4ffb1ba5f9cb5c553f29597298c6dc68244da5b9a8bbb3fce687bdb811bfa8dfcd6e2154b291a9edfc62dac65745b4bb6e585 WHIRLPOOL 710dfdecb00d9fa23df82e8efc8170ccd65dad81e5f5f7c34230ced2ed9ffdff0df580a80629f616c10a3ecbc36d79afe868f9800a5c187780e66ee4faff7812
+EBUILD qtgui-4.8.5-r1.ebuild 5651 SHA256 1e7436b30a461e3307b112315d889f0c3c58b30d23a24d5872f76340df044922 SHA512 562301304541ad6bc2e8e2af8d823b676d393130e05848fee0664debe7483da531c2beb39713d5eb51e195b172076ed0b262466d6cdd9678f43910d2b6d4d6b7 WHIRLPOOL 1c46a4b355360a3d3b8088092aa438b92e0a87f20375636305c757d25431dd1d670114b1fc509d34a773a8a15f4aeae511eede7bd3236ecff353e93ad1323b06
 EBUILD qtgui-4.8.5.ebuild 5603 SHA256 40758d9ede7d643f9480fd049c0b9030d805802a4ca48f95574858581aae656e SHA512 a7e90d7f0a584130f99184ad3ec51799add926003c20e994e18c24cb09fac67ff7a6119221c937327aa72db25ac389f956eceff67e445f84cb58e653f60fe181 WHIRLPOOL 2ec24f3432629463047f0bb1989193f3ca0348127fffd4f4796605af2a6101c5781b82917a5768d8ab9f9fda2ac3f84686b8181f897a6e8581bd1330e4a14fee
-MISC ChangeLog 34229 SHA256 ee34738f62ef0f93655ba0e64e9e07949deb7fb79c6863c92c13f501a1c3f64b SHA512 ad76fd41a174d46f88087f681291529bb1c6f903fa3ab10b7185570fb09d2da5af0a1a7c5151726c8c5797483634452616882f2c5c82ec663e819573ccc818e9 WHIRLPOOL e0bc8fcb6c3599e80a482311fefef594a1b1b4ecad779d92062314103d72adaad46e2fb30035d2a76f1d8610f7bf217b3a4232f332698281921692b5fda018d7
+MISC ChangeLog 34508 SHA256 2427bed3f3fda49cd41a2f85fc9122405b9262ae2d72c1a8fa8935c3f0f91523 SHA512 76f98c0f667a8b67778cda37be73f7f5b85aedcc36a4d3cdd52c62ed9b1c015a6330f8b1b147201c8045c3a48a9d2fa0d02249af19f79cd348b7c9e3e9556c3d WHIRLPOOL 92337776b17d78342a751648756d7ccd4f5ed4a010d3a9935aa7e91eccf1717ff9c1a1f4ea291f6280ece6c23d7c1440d2d0571684413bec8efc2fa668c5a853
 MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHMquAAoJEMbwO6tnXQ0stBoH/1CC7HaarC5GF+gXSFfPv7AS
-U+Eo5w+Hi0PsJvpYqjm/3gcuYnXeI2x0Xk5qOwscyvWmqpah9fzHrJXE9ZXnEaJs
-26sUFdESB93EImhIlJCs/w1ybK1/UXbKwg4OnRVKzlgbYVXuP2iqumynwX5frCKh
-2TuWmDDY4IDNThM04r18LT1A5ZOvde2CmsPB34bZa2W5JhV+0GWAq4c0nxAGqoy8
-PiETi5toDoqE8law8R5sKDOKiTgzqdGrHxFHsdKtRA+3F0KdGEbjJUqkj9Q8XBCl
-Sfu7dLFq3uJ1MRwyNnTUcTIxGP568YhWXvuXqtY7bpcg7lYQj1HqbQ0PGrdQwRk=
-=udzW
+iQEcBAEBCAAGBQJSQFH1AAoJEMbwO6tnXQ0sdQgIAI+e1xJYvxWRwwDvpVgY7ndI
+thROJu8YYTQJgrqiwtkOx2A4I8pmtYHNPJU3MyDRMPY7M0ypKgN3HnVM/p3BqH/A
+97moeH7BNtQRNJsih9HH00hkBjcfRHm0a2Pc9vJVpYJM/F18yCy1xfxfYm04p0ox
+TRFGfAu7VbR/iULODWI5pMzg+qH20OEavDOdhDrbO3vS3Ne63xSZJZKHkV7nlQBb
+YxA55yrjYuwN8LBz5DgbYbD5rVlG5ZlAcx/R9PU+/RHAuF9zn9J2LdxTt+4A4Dl2
+S1+vOPyiCCmv6C0jIpQ468slMmy6WDG4l5+qNFK56kS27qCqy9a5smfPsdv7DS8=
+=uAmq
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
new file mode 100644
index 000000000000..c975ebfaca2d
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
@@ -0,0 +1,41 @@
+From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@digia.com>
+Date: Sat, 31 Aug 2013 21:22:47 +0200
+Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb
+ layout."
+
+The change which attempted to fix QTBUG-15319 broke keyboard
+shortcuts for non latin keyboard layouts.
+
+This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
+regression.
+
+Task-number: QTBUG-32908
+
+Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/gui/kernel/qkeymapper_x11.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
+index 005ff3f..7daa41d 100644
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
+ 
+     // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
+     // always use them when determining the baseKeySym)
+-    // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
+-    //       XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
+-    //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
+     KeySym baseKeySym;
+     uint consumedModifiers;
+-    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
++    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
+                          &consumedModifiers, &baseKeySym))
+         return QList<int>();
+ 
+-- 
+1.8.3.2
+
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
new file mode 100644
index 000000000000..0fad825c978e
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.1 2013/09/23 14:39:21 kensington Exp $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+
+REQUIRED_USE="
+	gtkstyle? ( glib )
+"
+
+# cairo[-qt4] is needed because of bug 454066
+RDEPEND="
+	app-admin/eselect-qtgraphicssystem
+	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	cups? ( net-print/cups )
+	egl? ( media-libs/mesa[egl] )
+	gtkstyle? (
+		x11-libs/cairo[-qt4]
+		x11-libs/gtk+:2[aqua=]
+	)
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		xinerama? ( x11-proto/xineramaproto )
+		xv? ( x11-proto/videoproto )
+	)
+"
+PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.3-cups.patch"
+	"${FILESDIR}/${P}-keyboard-shortcuts.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/imageformats/tga
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src"
+
+	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
+	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
+	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
+
+	# mac version does not contain qtconfig?
+	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Add -xvideo to the list of accepted configure options
+	sed -i -e 's:|-xinerama|:&-xvideo|:' configure
+}
+
+src_configure() {
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)"
+
+	myconf+="
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+
+	qt4-build_src_configure
+
+	if use gtkstyle; then
+		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
+	fi
+
+	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
+}
+
+src_install() {
+	QCONFIG_ADD="
+		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig system-freetype gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
+		$(use mng && echo system-mng)
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG QT_FREETYPE
+			$(use gtkstyle && echo QT_STYLE_GTK)
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
+			$(use xinerama && echo QT_XINERAMA)
+			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+			$(use xv && echo QT_XVIDEO)"
+
+	qt4-build_src_install
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+	fi
+	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		# rerun to get links to headers right
+		fix_includes
+	fi
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+
+	# bug 388551
+	if use gtkstyle; then
+		local tempfile=${T}/${PN}${SLOT}.sh
+		cat <<-EOF > "${tempfile}"
+		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
+		EOF
+		insinto /etc/profile.d
+		doins "${tempfile}"
+	fi
+}
+
+pkg_postinst() {
+	qt4-build_pkg_postinst
+
+	# raster is the default graphicssystem, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+}