diff options
Diffstat (limited to 'kde/patch/krita')
-rw-r--r-- | kde/patch/krita/krita_qt512.patch | 117 | ||||
-rw-r--r-- | kde/patch/krita/krita_qt59.patch | 26 | ||||
-rw-r--r-- | kde/patch/krita/krita_qtabletevents.patch | 67 |
3 files changed, 0 insertions, 210 deletions
diff --git a/kde/patch/krita/krita_qt512.patch b/kde/patch/krita/krita_qt512.patch deleted file mode 100644 index 765d232..0000000 --- a/kde/patch/krita/krita_qt512.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 98aab8f2942cdc78dda8cfeba3580bd9d57e00a2 Mon Sep 17 00:00:00 2001 -From: Boudewijn Rempt <boud@valdyas.org> -Date: Fri, 5 Oct 2018 11:16:26 +0200 -Subject: [PATCH] Add a cmake option to disable our own tablet support - -Off by default, this makes it easier to check whether bugs are -caused by our fork of Qt's classes or to check whether Qt's tablet -support has improved. - -CCBUG:399379 ---- - CMakeLists.txt | 4 ++++ - config_use_qt_xcb.h.cmake | 6 ++++++ - krita/main.cc | 8 +++++++- - libs/ui/CMakeLists.txt | 12 ++++++++---- - libs/ui/input/wintab/qxcbconnection.cpp | 1 - - 5 files changed, 25 insertions(+), 6 deletions(-) - create mode 100644 config_use_qt_xcb.h.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17c9cd2d7..3199ae4da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -168,6 +168,10 @@ if (WIN32) - endif (MINGW) - endif () - -+option(USE_QT_XCB "Do not use Krita's forked XCB connection and tablet support on X11, but leave everything to Qt." OFF) -+configure_file(config_use_qt_xcb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_use_qt_xcb.h) -+add_feature_info("Use Qt's XCB and Tablet support on X11" USE_QT_XCB "Do not use Krita's forked XCB connection and tablet support on X11, but leave everything to Qt.") -+ - option(HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal." ON) - configure_file(config-hide-safe-asserts.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-hide-safe-asserts.h) - add_feature_info("Hide Safe Asserts" HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal.") -diff --git a/config_use_qt_xcb.h.cmake b/config_use_qt_xcb.h.cmake -new file mode 100644 -index 000000000..9fe3360cc ---- /dev/null -+++ b/config_use_qt_xcb.h.cmake -@@ -0,0 +1,6 @@ -+/* config_use_qt_xcb.h. Generated from config_use_qt_xcb.h.cmake */ -+ -+#cmakedefine USE_QT_XCB 1 -+ -+ -+ -diff --git a/krita/main.cc b/krita/main.cc -index dca2ee170..398fa3384 100644 ---- a/krita/main.cc -+++ b/krita/main.cc -@@ -63,8 +63,11 @@ - #include <QLibrary> - - #elif defined HAVE_X11 -+#include "config_use_qt_xcb.h" -+#ifndef USE_QT_XCB - #include <kis_xi2_event_filter.h> - #endif -+#endif - - #if defined HAVE_KCRASH - #include <kcrash.h> -@@ -336,8 +339,11 @@ extern "C" int main(int argc, char **argv) - } - - #if defined HAVE_X11 -- app.installNativeEventFilter(KisXi2EventFilter::instance()); -+ #ifndef USE_QT_XCB -+ app.installNativeEventFilter(KisXi2EventFilter::instance()); -+ #endif - #endif -+ - app.installEventFilter(KisQtWidgetsTweaker::instance()); - - -diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt -index 2909398ab..b4673ca92 100644 ---- a/libs/ui/CMakeLists.txt -+++ b/libs/ui/CMakeLists.txt -@@ -425,14 +425,18 @@ endif() - input/wintab/drawpile_tablettester/tablettest.cpp - ) - --if(UNIX) -+if (UNIX) - set(kritaui_LIB_SRCS - ${kritaui_LIB_SRCS} -- input/kis_tablet_event.cpp -- input/wintab/kis_tablet_support.cpp - qtlockedfile/qtlockedfile_unix.cpp - ) -- if(NOT APPLE) -+ if(NOT USE_QT_XCB) -+ set(kritaui_LIB_SRCS -+ ${kritaui_LIB_SRCS} -+ input/wintab/kis_tablet_support.cpp -+ ) -+ endif() -+ if(NOT APPLE AND NOT USE_QT_XCB) - set(kritaui_LIB_SRCS - ${kritaui_LIB_SRCS} - input/wintab/qxcbconnection_xi2.cpp -diff --git a/libs/ui/input/wintab/qxcbconnection.cpp b/libs/ui/input/wintab/qxcbconnection.cpp -index 5991bc187..c062d05e0 100644 ---- a/libs/ui/input/wintab/qxcbconnection.cpp -+++ b/libs/ui/input/wintab/qxcbconnection.cpp -@@ -41,7 +41,6 @@ - #include <QGuiApplication> - #include <QApplication> - -- - #include <X11/extensions/XI2proto.h> - #include <xcb/xproto.h> - --- -2.17.1 - diff --git a/kde/patch/krita/krita_qt59.patch b/kde/patch/krita/krita_qt59.patch deleted file mode 100644 index f517995..0000000 --- a/kde/patch/krita/krita_qt59.patch +++ /dev/null @@ -1,26 +0,0 @@ -Source: https://github.com/KDE/krita/commit/2f59d0d1.patch - -From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001 -From: Luca Beltrame <lbeltrame@kde.org> -Date: Sat, 6 May 2017 16:00:21 +0200 -Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build - -It's not used anywhere. - -Acked by boud. ---- - libs/ui/KisResourceBundleManifest.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp -index e4f94ca788..83761657d8 100644 ---- a/libs/ui/KisResourceBundleManifest.cpp -+++ b/libs/ui/KisResourceBundleManifest.cpp -@@ -22,7 +22,6 @@ - #include <QDomElement> - #include <QDomNode> - #include <QDomNodeList> --#include <QForeachContainer> - - #include <KoXmlNS.h> - #include <KoXmlReader.h> diff --git a/kde/patch/krita/krita_qtabletevents.patch b/kde/patch/krita/krita_qtabletevents.patch deleted file mode 100644 index a1d3869..0000000 --- a/kde/patch/krita/krita_qtabletevents.patch +++ /dev/null @@ -1,67 +0,0 @@ -# NOTE: original patch: https://cgit.kde.org/krita.git/commit/?id=a3193fe2 -# But first part (patch to ext_qt)) has been removed due to failure to apply. -# -- Eric Hameleers - -From a3193fe273c3f2c3b5493f77724a4bc099ae5e36 Mon Sep 17 00:00:00 2001 -From: Dmitry Kazakov <dimula73@gmail.com> -Date: Mon, 11 Mar 2019 16:49:31 +0300 -Subject: Add a hacky patch that ensures QTabletEvents to be ignored in - distribution builds - -If we ensure that all the tablet events are ignored, then Qt -will always generate synthesized mouse events, avoiding the -problem of lost Enter/Leave events. - -We also mark our own build of Qt about the presence of the fix -(therefore, it doesn't need this hack). ---- - libs/ui/input/kis_input_manager.cpp | 20 ++++++++++++++++ - -index 30a4677..d173543 100644 ---- a/libs/ui/input/kis_input_manager.cpp -+++ b/libs/ui/input/kis_input_manager.cpp -@@ -496,6 +496,13 @@ bool KisInputManager::eventFilterImpl(QEvent * event) - //Reset signal compressor to prevent processing events before press late - d->resetCompressor(); - d->eatOneMousePress(); -+ -+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH -+ // remove this hack when this patch is integrated: -+ // https://codereview.qt-project.org/#/c/255384/ -+ event->setAccepted(false); -+#endif -+ - break; - } - case QEvent::TabletMove: { -@@ -517,6 +524,12 @@ bool KisInputManager::eventFilterImpl(QEvent * event) - */ - d->blockMouseEvents(); - -+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH -+ // remove this hack when this patch is integrated: -+ // https://codereview.qt-project.org/#/c/255384/ -+ event->setAccepted(false); -+#endif -+ - break; - } - case QEvent::TabletRelease: { -@@ -529,6 +542,13 @@ bool KisInputManager::eventFilterImpl(QEvent * event) - retval = d->matcher.buttonReleased(tabletEvent->button(), tabletEvent); - retval = true; - event->setAccepted(true); -+ -+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH -+ // remove this hack when this patch is integrated: -+ // https://codereview.qt-project.org/#/c/255384/ -+ event->setAccepted(false); -+#endif -+ - break; - } - --- -cgit v1.1 - - |