diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-05-04 01:29:20 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-05-04 08:59:47 +0200 |
| commit | 125048ad7d212c1f226b709697505b0ee6a079e4 (patch) | |
| tree | 4d930a5b4d508518dedfc25375251fe24dda7b92 /source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch | |
| parent | fe8c535f50697455b55b8ded880317ac33910704 (diff) | |
| download | current-125048ad7d212c1f226b709697505b0ee6a079e4.tar.gz current-125048ad7d212c1f226b709697505b0ee6a079e4.tar.xz | |
Sat May 4 01:29:20 UTC 201920190504012920
d/gcc-9.1.0-x86_64-1.txz: Upgraded.
d/gcc-brig-9.1.0-x86_64-1.txz: Upgraded.
d/gcc-g++-9.1.0-x86_64-1.txz: Upgraded.
d/gcc-gfortran-9.1.0-x86_64-1.txz: Upgraded.
d/gcc-gnat-9.1.0-x86_64-1.txz: Upgraded.
d/gcc-go-9.1.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
d/gcc-objc-9.1.0-x86_64-1.txz: Upgraded.
d/libtool-2.4.6-x86_64-11.txz: Rebuilt.
Recompiled to update embedded GCC version number.
d/llvm-8.0.0-x86_64-2.txz: Rebuilt.
Recompiled with -DLLVM_INSTALL_UTILS=ON. Thanks to Lockywolf.
d/swig-4.0.0-x86_64-1.txz: Upgraded.
l/glib2-2.60.2-x86_64-1.txz: Upgraded.
l/qt-4.8.7-x86_64-13.txz: Rebuilt.
Patched to fix FTBFS with gcc9 (also fixes FTBFS with qtscriptgenerator and
possibly other projects that use qt4).
Diffstat (limited to 'source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch')
| -rw-r--r-- | source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch new file mode 100644 index 000000000..9a9f77353 --- /dev/null +++ b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch @@ -0,0 +1,22 @@ +diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp +--- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 +@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() + return; + } + +- static QString themeName; +- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { +- themeName = getThemeName(); +- +- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { +- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, +- // we cannot support the GTK_Qt Gtk engine +- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); +- return; +- } +- } +- + if (QGtkStylePrivate::gtk_init) { + // Gtk will set the Qt error handler so we have to reset it afterwards + x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); |