From 7793fafdb645c321a38c4fc11a5ca0cee0b80494 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Sep 2014 12:57:56 -0500 Subject: [PATCH] refresh old_xcb.patch --- qt5-qtbase.spec | 2 +- ... qtbase-opensource-src-5.3.2-old_xcb.patch | 48 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) rename qtbase-opensource-src-5.3.0-old-xcb.patch => qtbase-opensource-src-5.3.2-old_xcb.patch (82%) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 294b99a..526f3ad 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -53,7 +53,7 @@ Source5: qconfig-multilib.h Source6: 10-qt5-check-opengl2.sh # support the old versions of libxcb and libxkbcommon in F19 and F20 -Patch1: qtbase-opensource-src-5.3.0-old-xcb.patch +Patch1: qtbase-opensource-src-5.3.2-old_xcb.patch # support multilib optflags Patch2: qtbase-multilib_optflags.patch diff --git a/qtbase-opensource-src-5.3.0-old-xcb.patch b/qtbase-opensource-src-5.3.2-old_xcb.patch similarity index 82% rename from qtbase-opensource-src-5.3.0-old-xcb.patch rename to qtbase-opensource-src-5.3.2-old_xcb.patch index 00ef724..45b15dd 100644 --- a/qtbase-opensource-src-5.3.0-old-xcb.patch +++ b/qtbase-opensource-src-5.3.2-old_xcb.patch @@ -1,7 +1,7 @@ -diff -ur qtbase-opensource-src-5.3.0/configure qtbase-opensource-src-5.3.0-old-xcb/configure ---- qtbase-opensource-src-5.3.0/configure 2014-05-15 19:12:04.000000000 +0200 -+++ qtbase-opensource-src-5.3.0-old-xcb/configure 2014-06-01 23:45:21.000000000 +0200 -@@ -4946,10 +4946,8 @@ +diff -up qtbase-opensource-src-5.3.2/configure.old_xcb qtbase-opensource-src-5.3.2/configure +--- qtbase-opensource-src-5.3.2/configure.old_xcb 2014-09-11 05:47:55.000000000 -0500 ++++ qtbase-opensource-src-5.3.2/configure 2014-09-16 12:55:41.511468849 -0500 +@@ -4982,10 +4982,8 @@ if [ "$CFG_XCB" != "no" ]; then QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" fi @@ -13,7 +13,7 @@ diff -ur qtbase-opensource-src-5.3.0/configure qtbase-opensource-src-5.3.0-old-x QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`" QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`" if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then -@@ -5051,14 +5049,14 @@ +@@ -5087,14 +5085,14 @@ if [ "$CFG_KMS" != "no" ]; then fi # Detect libxkbcommon @@ -32,7 +32,7 @@ diff -ur qtbase-opensource-src-5.3.0/configure qtbase-opensource-src-5.3.0-old-x QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -6552,7 +6550,7 @@ +@@ -6588,7 +6586,7 @@ if [ "$CFG_OPENSSL" = "linked" ] && [ "$ echo fi if [ "$ORIG_CFG_XKBCOMMON" != qt ] && [ "$CFG_XKBCOMMON" = qt ]; then @@ -41,10 +41,10 @@ diff -ur qtbase-opensource-src-5.3.0/configure qtbase-opensource-src-5.3.0-old-x echo "the bundled version from 3rd party directory." fi if [ "$CFG_XKBCOMMON" = "qt" ] && [ "$CFG_XKB_CONFIG_ROOT" = "not found" ]; then -diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbconnection.cpp qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbconnection.cpp ---- qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbconnection.cpp 2014-05-15 19:12:17.000000000 +0200 -+++ qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbconnection.cpp 2014-06-02 00:17:14.000000000 +0200 -@@ -1698,7 +1698,7 @@ +diff -up qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbconnection.cpp.old_xcb qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbconnection.cpp +--- qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbconnection.cpp.old_xcb 2014-09-11 05:48:06.000000000 -0500 ++++ qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbconnection.cpp 2014-09-16 12:55:41.512468839 -0500 +@@ -1710,7 +1710,7 @@ void QXcbConnection::initializeXKB() xcb_xkb_use_extension_cookie_t xkb_query_cookie; xcb_xkb_use_extension_reply_t *xkb_query; @@ -53,10 +53,10 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbconnection.cp xkb_query = xcb_xkb_use_extension_reply(c, xkb_query_cookie, 0); if (!xkb_query) { -diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbkeyboard.cpp ---- qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-05-15 19:12:17.000000000 +0200 -+++ qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-06-30 19:08:22.000000000 +0200 -@@ -697,50 +697,65 @@ +diff -up qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.cpp.old_xcb qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.cpp +--- qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.cpp.old_xcb 2014-09-11 05:48:06.000000000 -0500 ++++ qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.cpp 2014-09-16 12:55:41.512468839 -0500 +@@ -697,50 +697,65 @@ void QXcbKeyboard::updateKeymap() // log only critical errors, we do our own error logging from printKeymapError() xkb_context_set_log_level(xkb_context, (xkb_log_level)XKB_LOG_LEVEL_CRITICAL); } @@ -157,7 +157,7 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp } #ifndef QT_NO_XKB -@@ -856,7 +871,7 @@ +@@ -856,7 +871,7 @@ QList QXcbKeyboard::possibleKeys(co return QList(); QList result; @@ -166,7 +166,7 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp result += (baseQtKey + modifiers); // The base key is _always_ valid, of course xkb_mod_index_t shiftMod = xkb_keymap_mod_get_index(xkb_keymap, "Shift"); -@@ -903,7 +918,7 @@ +@@ -903,7 +918,7 @@ QList QXcbKeyboard::possibleKeys(co continue; Qt::KeyboardModifiers mods = modifiers & ~neededMods; @@ -175,7 +175,7 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp if (qtKey == baseQtKey) continue; -@@ -986,11 +1001,23 @@ +@@ -995,11 +1010,23 @@ QXcbKeyboard::QXcbKeyboard(QXcbConnectio if (connection->hasXKB()) { updateVModMapping(); updateVModToRModMapping(); @@ -201,7 +201,7 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp } else { #endif m_key_symbols = xcb_key_symbols_alloc(xcb_connection()); -@@ -1320,7 +1347,7 @@ +@@ -1336,7 +1363,7 @@ void QXcbKeyboard::handleKeyEvent(xcb_wi Qt::KeyboardModifiers modifiers = translateModifiers(state); @@ -210,7 +210,7 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp int count = string.size(); string.truncate(count); -@@ -1383,12 +1410,18 @@ +@@ -1400,12 +1427,18 @@ void QXcbKeyboard::handleKeyEvent(xcb_wi } } @@ -233,9 +233,9 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.cpp return QString::fromUtf8(chars); } -diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.h qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbkeyboard.h ---- qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-05-15 19:12:17.000000000 +0200 -+++ qtbase-opensource-src-5.3.0-old-xcb/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-06-30 19:06:35.000000000 +0200 +diff -up qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.h.old_xcb qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.h +--- qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.h.old_xcb 2014-09-11 05:48:06.000000000 -0500 ++++ qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbkeyboard.h 2014-09-16 12:56:38.381878563 -0500 @@ -47,9 +47,6 @@ #include @@ -246,8 +246,8 @@ diff -ur qtbase-opensource-src-5.3.0/src/plugins/platforms/xcb/qxcbkeyboard.h qt #include -@@ -86,7 +83,7 @@ - void handleKeyEvent(QWindow *window, QEvent::Type type, xcb_keycode_t code, quint16 state, xcb_timestamp_t time); +@@ -86,7 +83,7 @@ protected: + void handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type, xcb_keycode_t code, quint16 state, xcb_timestamp_t time); void resolveMaskConflicts(); - QString lookupString(struct xkb_state *state, xcb_keycode_t code) const;