rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase old_xkbcommon.patch

Browse Source
This commit is contained in:
Rex Dieter 2014-10-30 14:25:21 -05:00
parent b84181099c
commit c242367a7f
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qt5-qtbase.spec
View File

@ -59,8 +59,8 @@ Source6: 10-qt5-check-opengl2.sh
# in F19 and F20 # in F19 and F20
Patch0: qtbase-opensource-src-5.4.0-old_xcb.patch Patch0: qtbase-opensource-src-5.4.0-old_xcb.patch
# support the old version of libxkbcommon in F19 and F20 # support the old version of libxkbcommon in F19
Patch1: qtbase-opensource-src-5.3.2-old_xkbcommon.patch Patch1: qtbase-opensource-src-5.4.0-old_xkbcommon.patch
# support multilib optflags # support multilib optflags
Patch2: qtbase-multilib_optflags.patch Patch2: qtbase-multilib_optflags.patch

39
qtbase-opensource-src-5.3.2-old_xkbcommon.patch → qtbase-opensource-src-5.4.0-old_xkbcommon.patch
View File

@ -1,28 +1,19 @@
diff -ur qtbase-opensource-src-5.3.2-old_xcb/configure qtbase-opensource-src-5.3.2-old_xkbcommon/configure diff -up qtbase-opensource-src-5.4.0-beta/configure.old_xkbcommon qtbase-opensource-src-5.4.0-beta/configure
--- qtbase-opensource-src-5.3.2-old_xcb/configure 2014-10-08 19:46:02.000000000 +0200 --- qtbase-opensource-src-5.4.0-beta/configure.old_xkbcommon 2014-10-30 14:22:00.388881243 -0500
+++ qtbase-opensource-src-5.3.2-old_xkbcommon/configure 2014-10-08 19:42:46.000000000 +0200 +++ qtbase-opensource-src-5.4.0-beta/configure 2014-10-30 14:23:39.800851375 -0500
@@ -5085,7 +5085,7 @@ @@ -5143,7 +5143,7 @@ if [ "$CFG_KMS" != "no" ]; then
fi fi
# Detect libxkbcommon # Detect libxkbcommon
-MIN_REQ_XKBCOMMON="0.4.1" -MIN_REQ_XKBCOMMON="0.4.1"
+MIN_REQ_XKBCOMMON="0.3.0" +MIN_REQ_XKBCOMMON="0.3.0"
ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON"
# currently only xcb platform plugin supports building xkbcommon # currently only xcb platform plugin supports building xkbcommon
if [ "$CFG_XCB" != "no" ]; then if [ "$CFG_XCB" != "no" ]; then
diff -ur qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeyboard.cpp qtbase-opensource-src-5.3.2-old_xkbcommon/src/plugins/platforms/xcb/qxcbkeyboard.cpp if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then
--- qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-10-08 19:46:02.000000000 +0200 diff -up qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.cpp.old_xkbcommon qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ qtbase-opensource-src-5.3.2-old_xkbcommon/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-10-08 19:42:46.000000000 +0200 --- qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.cpp.old_xkbcommon 2014-10-30 14:22:00.383881294 -0500
@@ -871,7 +871,7 @@ +++ qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-10-30 14:22:00.390881222 -0500
return QList<int>(); @@ -916,7 +916,7 @@ QList<int> QXcbKeyboard::possibleKeys(co
QList<int> result;
- int baseQtKey = keysymToQtKey(sym, modifiers, lookupString(kb_state, event->nativeScanCode()));
+ int baseQtKey = keysymToQtKey(sym, modifiers, keysymToUnicode(sym));
result += (baseQtKey + modifiers); // The base key is _always_ valid, of course
xkb_mod_index_t shiftMod = xkb_keymap_mod_get_index(xkb_keymap, "Shift");
@@ -918,7 +918,7 @@
continue; continue;
Qt::KeyboardModifiers mods = modifiers & ~neededMods; Qt::KeyboardModifiers mods = modifiers & ~neededMods;
@ -31,7 +22,7 @@ diff -ur qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeybo
if (qtKey == baseQtKey) if (qtKey == baseQtKey)
continue; continue;
@@ -1363,7 +1363,7 @@ @@ -1361,7 +1361,7 @@ void QXcbKeyboard::handleKeyEvent(xcb_wi
Qt::KeyboardModifiers modifiers = translateModifiers(state); Qt::KeyboardModifiers modifiers = translateModifiers(state);
@ -40,7 +31,7 @@ diff -ur qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeybo
int count = string.size(); int count = string.size();
string.truncate(count); string.truncate(count);
@@ -1427,12 +1427,18 @@ @@ -1425,12 +1425,18 @@ void QXcbKeyboard::handleKeyEvent(xcb_wi
} }
} }
@ -63,10 +54,10 @@ diff -ur qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeybo
return QString::fromUtf8(chars); return QString::fromUtf8(chars);
} }
diff -ur qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeyboard.h qtbase-opensource-src-5.3.2-old_xkbcommon/src/plugins/platforms/xcb/qxcbkeyboard.h diff -up qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.h.old_xkbcommon qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.h
--- qtbase-opensource-src-5.3.2-old_xcb/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-10-08 19:46:02.000000000 +0200 --- qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.h.old_xkbcommon 2014-10-30 14:22:00.383881294 -0500
+++ qtbase-opensource-src-5.3.2-old_xkbcommon/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-10-08 19:42:46.000000000 +0200 +++ qtbase-opensource-src-5.4.0-beta/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-10-30 14:22:00.390881222 -0500
@@ -83,7 +83,7 @@ @@ -75,7 +75,7 @@ protected:
void handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type, xcb_keycode_t code, quint16 state, xcb_timestamp_t time); void handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type, xcb_keycode_t code, quint16 state, xcb_timestamp_t time);
void resolveMaskConflicts(); void resolveMaskConflicts();