Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs/files/
Date: Sat, 02 Dec 2017 08:35:10
Message-Id: 1512203691.e7f6713a59374f782dc43d3f42329e245b167bcf.asturm@gentoo
1 commit: e7f6713a59374f782dc43d3f42329e245b167bcf
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 2 08:15:26 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 2 08:34:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f6713a
7
8 kde-frameworks/kdelibs: remove unused patch
9
10 .../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch | 46 ----------------------
11 1 file changed, 46 deletions(-)
12
13 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
14 deleted file mode 100644
15 index aca4fe41246..00000000000
16 --- a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
17 +++ /dev/null
18 @@ -1,46 +0,0 @@
19 -diff -purN kdeui/util/kkeyserver_mac.cpp kdeui/util/kkeyserver_mac.cpp
20 ---- a/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500
21 -+++ b/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500
22 -@@ -68,7 +68,7 @@ namespace KKeyServer {
23 - #ifdef QT_MAC_USE_COCOA
24 - static TISInputSourceRef lastLayout = 0;
25 - #else
26 -- static KeyboardLayoutRef lastLayout = NULL;
27 -+ static TISInputSourceRef lastLayout = NULL;
28 - #endif
29 -
30 - void updateScancodes() {
31 -@@ -125,16 +125,27 @@ namespace KKeyServer {
32 - #endif
33 - lastLayout = layout;
34 - scancodes.clear();
35 -- void *kchr;
36 -- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
37 -+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
38 -+ if (uchr == NULL) {
39 - kWarning() << "Couldn't load active keyboard layout";
40 - } else {
41 - for (int i = 0; i < 128; i++) {
42 - UInt32 tmpState = 0;
43 -- UInt32 chr = KeyTranslate(kchr, i, &tmpState);
44 -- if (chr && chr != kFunctionKeyCharCode) {
45 -- scancodes.insert(chr, i);
46 -- }
47 -+ UInt32 deadKeyState = 0;
48 -+ UInt32 flags = 0;
49 -+ UniCharCount maxStringLength = 255;
50 -+ UniCharCount actualStringLength = 0;
51 -+ UniChar unicodeString[maxStringLength];
52 -+
53 -+ UCKeyTranslate(uchr, i, kUCKeyActionDown,
54 -+ flags, LMGetKbdType(),
55 -+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
56 -+ fprintf(stderr, "Got key: %s\n", unicodeString);
57 -+ fflush(stderr);
58 -+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
59 -+ //if (chr && chr != kFunctionKeyCharCode) {
60 -+ // scancodes.insert(chr, i);
61 -+ //}
62 - }
63 - }
64 - }