diff --git a/SOURCES/qt-revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch b/SOURCES/qt-revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch new file mode 100644 index 0000000..f6ea98c --- /dev/null +++ b/SOURCES/qt-revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch @@ -0,0 +1,40 @@ +From 0bbc2108aa2fe60c32f3fb01926e707cc29e0b81 Mon Sep 17 00:00:00 2001 +From: Gatis Paeglis +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 +--- + 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 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(); + +-- +1.9.3 diff --git a/SPECS/qt.spec b/SPECS/qt.spec index 57dd38b..0465429 100644 --- a/SPECS/qt.spec +++ b/SPECS/qt.spec @@ -26,7 +26,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.5 -Release: 11%{?dist} +Release: 12%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -163,6 +163,10 @@ Patch102: qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.p # https://bugreports.qt-project.org/browse/QTBUG-22829 Patch113: qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch +# revert fix for QTBUG-15319 +# https://bugzilla.redhat.com/show_bug.cgi?id=1259675 +Patch114: qt-revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch + ## upstream git # security patches @@ -527,6 +531,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch101 -p1 -R -b .QTBUG-30076 %patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check %patch113 -p1 -b .QTBUG-22829 +%patch114 -p1 -b .revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch # upstream git @@ -1218,6 +1223,10 @@ fi %changelog +* Thu Mar 24 2016 Jan Grulich - 1:4.8.5-12 +- Revert upstream fix for QTBUG-15319 + Resolves: bz#1321025 + * Wed Sep 02 2015 Jan Grulich - 1:4.8.5-11 - aarch64 fixes Resolves: bz#1258902