control: tags 719064 + patch Hi,
> As long as upstream does not ACK the patches we will not apply them in Debian. > Looking at https://codereview.qt-project.org/#change,64283 it seems that the > patch has been not accepted. > > If you are interested in this fix, please work with upstream to solve it. I > will happily apply it once upstream positively acknowledges it. Please read the whole discussion about this patch: https://codereview.qt-project.org/#change,64283 https://codereview.qt-project.org/#patch,all_unified,64283,1 Upstream does not have objections about this (trivial) patch itself. (This is just a revert of destructive commit which was done earlier.) Upstream only calls for more detailed commit message. So why do we need to wait until this commit message will be rewritten? > On the other hand, we the Debian Qt/KDE team do not want people not listed in > Uploaders pushing stuff to our repos, except if a team member explicitely > allows it. Moreover, we try to avoid topic branches for fixes like this. Next > time please attach a patch. > > I have just deleted the branch in the repo. Ok. See attachment. Best regards, Boris
From bc1e27e7224f5b4faff7a60ba756d3209f74e172 Mon Sep 17 00:00:00 2001 From: Boris Pek <tehnic...@yandex.ru> Date: Sun, 1 Sep 2013 19:18:54 +0300 Subject: [PATCH] Add fix-keyboard-shortcuts-in-multi-language-mode.patch --- .../fix-keyboard-shortcuts-in-multi-language-mode.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 2 files changed, 18 insertions(+) create mode 100644 debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch diff --git a/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch b/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch new file mode 100644 index 0000000..b88ed86 --- /dev/null +++ b/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch @@ -0,0 +1,17 @@ +Description: fix keyboard shortcuts in multi-language mode +Origin: https://codereview.qt-project.org/#change,64283 +Bug: https://bugreports.qt-project.org/browse/QTBUG-32908 +Bug-Debian: http://bugs.debian.org/719064 + +diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp +--- a/src/gui/kernel/qkeymapper_x11.cpp ++++ b/src/gui/kernel/qkeymapper_x11.cpp +@@ -287,7 +287,7 @@ + // 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>(); + diff --git a/debian/patches/series b/debian/patches/series index 286d023..98fb068 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,3 +44,4 @@ no_libicu_message.diff QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch qtdoc-build-offline-docs.patch +fix-keyboard-shortcuts-in-multi-language-mode.patch -- 1.8.4.rc3
