summaryrefslogtreecommitdiffstats
path: root/deps
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--deps/qt5/.deps1
-rw-r--r--deps/qt5/.url2
-rw-r--r--deps/qt5/patches/qt5.qt5uitoolsconfig.patch17
-rw-r--r--deps/qt5/patches/qtbase-qxcbwindow.patch97
-rw-r--r--deps/qt5/patches/qtbase-zlib-compression.patch41
-rwxr-xr-xdeps/qt5/qt5.SlackBuild34
6 files changed, 173 insertions, 19 deletions
diff --git a/deps/qt5/.deps b/deps/qt5/.deps
index d1eaacd..7208d9b 100644
--- a/deps/qt5/.deps
+++ b/deps/qt5/.deps
@@ -1,2 +1,3 @@
OpenAL
libxkbcommon
+wolff2
diff --git a/deps/qt5/.url b/deps/qt5/.url
index 43c00d1..6563ae9 100644
--- a/deps/qt5/.url
+++ b/deps/qt5/.url
@@ -1 +1 @@
-https://download.qt.io/official_releases/qt/5.12/5.12.3/single/qt-everywhere-src-5.12.3.tar.xz
+https://download.qt.io/official_releases/qt/5.13/5.13.0/single/qt-everywhere-src-5.13.0.tar.xz
diff --git a/deps/qt5/patches/qt5.qt5uitoolsconfig.patch b/deps/qt5/patches/qt5.qt5uitoolsconfig.patch
new file mode 100644
index 0000000..1a0da5b
--- /dev/null
+++ b/deps/qt5/patches/qt5.qt5uitoolsconfig.patch
@@ -0,0 +1,17 @@
+The fix for https://bugreports.qt.io/browse/QTBUG-76244 was not complete.
+Further quoting is needed to deal with empty variables.
+-- Eric Hameleers <alien@slackware.com>
+
+--- qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 06:18:18.000000000 +0200
++++ qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-09 19:37:15.253291684 +0200
+@@ -57,8 +57,8 @@
+
+ if(EXISTS \"${prl_file_location}\")
+ file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\")
+- string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings})
+- string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends})
++ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends \"${_prl_strings}\")
++ string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends \"${_static_depends}\")
+ string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\")
+ set(_search_paths)
+ string(REPLACE \"\\$\\$[QT_INSTALL_LIBS]\" \"${_qt5_install_libs}\" _static_depends \"${_static_depends}\")
diff --git a/deps/qt5/patches/qtbase-qxcbwindow.patch b/deps/qt5/patches/qtbase-qxcbwindow.patch
new file mode 100644
index 0000000..62a0bb4
--- /dev/null
+++ b/deps/qt5/patches/qtbase-qxcbwindow.patch
@@ -0,0 +1,97 @@
+Taken from: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117
+
+From 0c1831178540462da31fd7a4b6d2e446bc84498b Mon Sep 17 00:00:00 2001
+From: Erik Kurzinger <ekurzinger@nvidia.com>
+Date: Thu, 13 Jun 2019 08:15:50 -0700
+Subject: Track swap interval in QXcbWindow
+
+As per GLX_EXT_swap_control, the GLX swap interval is specified on a
+per-drawable basis. However, QGLXContext only tracks it per-context
+using the m_swapInterval member. If a new drawable is made current to a
+context, it is still necessary to call glXSwapIntervalEXT to change the
+swap interval, even if it has been previously called for the same
+context with a different drawable. However, currently,
+QGLXContext::makeCurrent doesn't do this if its m_swapInterval field
+matches the new swap interval. This change removes m_swapInterval from
+QGLXContext, instead tracking it in QXcbWindow. This still avoids
+unnecessary calls to glXSwapIntervalEXT, while ensuring the swap
+interval is always set for new window drawables.
+
+Change-Id: Idc34101476c6af618059f6f3d8925dee743994a3
+Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+---
+ .../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 6 +++---
+ src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h | 1 -
+ src/plugins/platforms/xcb/qxcbwindow.h | 4 ++++
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+index 4adf662152..f26f698e76 100644
+--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -204,7 +204,6 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat
+ , m_shareContext(0)
+ , m_format(format)
+ , m_isPBufferCurrent(false)
+- , m_swapInterval(-1)
+ , m_ownsContext(nativeHandle.isNull())
+ , m_getGraphicsResetStatus(0)
+ , m_lost(false)
+@@ -567,9 +566,9 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface)
+
+ if (success && surfaceClass == QSurface::Window) {
+ int interval = surface->format().swapInterval();
++ QXcbWindow *window = static_cast<QXcbWindow *>(surface);
+ QXcbScreen *screen = screenForPlatformSurface(surface);
+- if (interval >= 0 && m_swapInterval != interval && screen) {
+- m_swapInterval = interval;
++ if (interval >= 0 && interval != window->swapInterval() && screen) {
+ typedef void (*qt_glXSwapIntervalEXT)(Display *, GLXDrawable, int);
+ typedef void (*qt_glXSwapIntervalMESA)(unsigned int);
+ static qt_glXSwapIntervalEXT glXSwapIntervalEXT = 0;
+@@ -588,6 +587,7 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface)
+ glXSwapIntervalEXT(m_display, glxDrawable, interval);
+ else if (glXSwapIntervalMESA)
+ glXSwapIntervalMESA(interval);
++ window->setSwapInterval(interval);
+ }
+ }
+
+diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
+index be9d3f5dcb..2a88fd6e59 100644
+--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
+@@ -87,7 +87,6 @@ private:
+ GLXContext m_shareContext;
+ QSurfaceFormat m_format;
+ bool m_isPBufferCurrent;
+- int m_swapInterval;
+ bool m_ownsContext;
+ GLenum (APIENTRY * m_getGraphicsResetStatus)();
+ bool m_lost;
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
+index f98cd8a74d..8258cc2dfa 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.h
++++ b/src/plugins/platforms/xcb/qxcbwindow.h
+@@ -184,6 +184,9 @@ public:
+ static void setWindowTitle(const QXcbConnection *conn, xcb_window_t window, const QString &title);
+ static QString windowTitle(const QXcbConnection *conn, xcb_window_t window);
+
++ int swapInterval() const { return m_swapInterval; }
++ void setSwapInterval(int swapInterval) { m_swapInterval = swapInterval; }
++
+ public Q_SLOTS:
+ void updateSyncRequestCounter();
+
+@@ -276,6 +279,7 @@ protected:
+ SyncState m_syncState = NoSyncNeeded;
+
+ QXcbSyncWindowRequest *m_pendingSyncRequest = nullptr;
++ int m_swapInterval = -1;
+ };
+
+ class QXcbForeignWindow : public QXcbWindow
+--
+cgit v1.2.1
+
diff --git a/deps/qt5/patches/qtbase-zlib-compression.patch b/deps/qt5/patches/qtbase-zlib-compression.patch
new file mode 100644
index 0000000..a6896a4
--- /dev/null
+++ b/deps/qt5/patches/qtbase-zlib-compression.patch
@@ -0,0 +1,41 @@
+Taken from: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77
+
+From cbdc9a7786278c31fdb6eb465f32d0374349c1ef Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Thu, 20 Jun 2019 09:36:46 -0700
+Subject: RCC: Change the default compression to Zlib
+
+Codebases using QResource::isCompressed() and assuming it is Zlib break
+if zstd is enabled. So change the default back to Zlib until Qt 6.0.
+
+[ChangeLog][Important Behavior Changes] RCC's default compression
+algorithm was changed back to Zlib, as it was in all previous releases
+until 5.13.0. The default will remain Zlib for all Qt 5.x releases but
+will change in Qt 6.0. To activate Zstd compression for your resources,
+either pass the --compress-algo=zstd option to the rcc tool or add the
+XML attribute compression-algorithm="zstd" to the <file> tags in the
+.qrc file.
+
+Task-number: QTBUG-76521
+Change-Id: Ief874765cd7b43798de3fffd15a9f56fd9ad1ad4
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+---
+ src/tools/rcc/rcc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
+index 862e574f2d..011a7db810 100644
+--- a/src/tools/rcc/rcc.cpp
++++ b/src/tools/rcc/rcc.cpp
+@@ -58,7 +58,7 @@ enum {
+ CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70
+ };
+
+-#if QT_CONFIG(zstd)
++#if QT_CONFIG(zstd) && QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+ # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zstd
+ #elif !defined(QT_NO_COMPRESS)
+ # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zlib
+--
+cgit v1.2.1
+
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 9ee003d..107b1a0 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -62,11 +62,12 @@
# Modifications for qt 5.11.3 2018 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.12.1 2019 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.12.3 2019 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.13.0 2019 by Eric Hameleers, Eindhoven, NL
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5
-VERSION=${VERSION:-5.12.3}
+VERSION=${VERSION:-5.13.0}
BUILD=${BUILD:-1}
PKGSRC=$(echo $VERSION |cut -d- -f1)
PKGVER=$(echo $VERSION |tr - _)
@@ -156,20 +157,16 @@ fi
# Fix path to mysql header:
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
-## Fix compilation error in chromium caused by gcc8:
-#cd qtwebengine
-# cat $CWD/patches/qt5.webengine_gcc8.patch | patch -p1 --verbose || exit 1
-#cd - 1>/dev/null
-
-## QSyntaxHighlighter: cancel delayed highlight if done manually:
-#cd qtbase
-# cat $CWD/patches/qt5.delayed_highlight.patch | patch -p1 --verbose || exit 1
-#cd - 1>/dev/null
+# Fix freezes in KWin on hybrid NVIDIA systems (also solved in KWin 5.16.2):
+cd qtbase
+ cat $CWD/patches/qtbase-qxcbwindow.patch | patch -p1 --verbose || exit 1
+cd - 1>/dev/null
-## Fix regression in QPlainTextEdit updating (QTBUG-69310):
-#cd qtbase
-# cat $CWD/patches/qt5.qtbug-69310.patch | patch -p1 --verbose || exit 1
-#cd - 1>/dev/null
+# Change the default compression back to zlib for backwards compatibility,
+# QTBUG-76521:
+cd qtbase
+ cat $CWD/patches/qtbase-zlib-compression.patch | patch -p1 --verbose || exit 1
+cd - 1>/dev/null
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
# and for it breaks KWin compilation with:
@@ -180,6 +177,10 @@ cd qtbase
| patch -p1 --verbose || exit 1
cd - 1>/dev/null
+# More quoting is needed (QTBUG-76244) to fix the error in kjsembed (at least):
+# "Error:string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command."
+cat $CWD/patches/qt5.qt5uitoolsconfig.patch | patch -p1 --verbose || exit 1
+
if ! pkg-config --exists libpulse 2>/dev/null ; then
# Forcibly disable pulseaudio in qtwebengine:
cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
@@ -195,10 +196,6 @@ sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
-i qtbase/mkspecs/common/g++-unix.conf || exit 1
-# All languages are now enabled by default in the virtual keyboard
-# (required by Plasma 5.11):
-#echo "CONFIG += lang-all" >> qtvirtualkeyboard/.qmake.conf
-
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
@@ -238,6 +235,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
-xcb \
-nomake examples \
-nomake tests \
+ -no-mimetype-database \
-no-separate-debug-info \
-no-strip \
-no-use-gold-linker \