Date: Thursday, October 24, 2013 @ 15:08:51
Author: andrea
Revision: 197231
upgpkg: qt4 4.8.5-6
Fix non-english keyboard shortcuts regression (FS#36947)
Added:
qt4/trunk/qtbug-32908.patch
Modified:
qt4/trunk/PKGBUILD
-------------------+
PKGBUILD | 9 ++++++---
qtbug-32908.patch | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-24 13:06:07 UTC (rev 197230)
+++ PKGBUILD 2013-10-24 13:08:51 UTC (rev 197231)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,7 +32,7 @@
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
- 'qtbug-31579.patch' 'qtbug-32534.patch')
+ 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch')
md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -41,7 +41,8 @@
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971'
'6ed8d26a8e4a9bba1f6c08fb99cc8357'
- 'bb0e0fa6ba953fa590d81ac612374e11')
+ 'bb0e0fa6ba953fa590d81ac612374e11'
+ 'db343dcae522bc90d802ad1e83b7f5dd')
prepare() {
cd ${_pkgfqn}
@@ -53,6 +54,8 @@
patch -p1 -i "${srcdir}"/qtbug-31579.patch
# (FS#36394) (QTBUG#32534)
patch -p1 -i "${srcdir}"/qtbug-32534.patch
+ # (FS#36947) (QTBUG#32908)
+ patch -p1 -i "${srcdir}"/qtbug-32908.patch
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
Added: qtbug-32908.patch
===================================================================
--- qtbug-32908.patch (rev 0)
+++ qtbug-32908.patch 2013-10-24 13:08:51 UTC (rev 197231)
@@ -0,0 +1,40 @@
+From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeg...@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.fa...@kdab.com>
+---
+ src/gui/kernel/qkeymapper_x11.cpp | 5 +----
+ 1 files changed, 1 insertions(+), 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.7.1
+
