summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-10 12:10:26 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-10 12:10:26 +0100
commit12a210020222a76756869800cabc768fd0ac73ee (patch)
tree4c7e230064f20b2c856c762ddbcbc33882183978
parent20d97e6884e8ab07cb947538e0af23143d3e5d0b (diff)
downloadktown-12a210020222a76756869800cabc768fd0ac73ee.tar.gz
ktown-12a210020222a76756869800cabc768fd0ac73ee.tar.xz
qt5: patched QTBUG-48321 which affects the new VLC 2.2.2 fullscreen mode.
-rw-r--r--deps/qt5/patches/qt5.whandle.patch24
-rwxr-xr-xdeps/qt5/qt5.SlackBuild5
2 files changed, 28 insertions, 1 deletions
diff --git a/deps/qt5/patches/qt5.whandle.patch b/deps/qt5/patches/qt5.whandle.patch
new file mode 100644
index 0000000..4428974
--- /dev/null
+++ b/deps/qt5/patches/qt5.whandle.patch
@@ -0,0 +1,24 @@
+From: Ulf Hermann <ulf.hermann@theqtcompany.com>
+Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
+Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
+
+WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+
+Task-number: QTBUG-48321
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
+---
+
+diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
+index a006246..024005d 100644
+--- a/qtbase/src/widgets/kernel/qwidget.cpp
++++ b/qtbase/src/widgets/kernel/qwidget.cpp
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+
+ bool needsShow = false;
+
+- if (q->isWindow()) {
++ if (q->isWindow() || q->windowHandle()) {
+ if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+ q->setAttribute(Qt::WA_OutsideWSRange, true);
+ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 6d01810..168f1b0 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -48,7 +48,7 @@
PKGNAM=qt5
VERSION=${VERSION:-5.5.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:--j7}
@@ -135,6 +135,9 @@ cd qtmultimedia
cat $CWD/patches/qt5.alsa.patch | patch -p0 --verbose || exit 1
cd -
+# Prevent cropped video in full-screen mode (QTBUG-48321):
+cat $CWD/patches/qt5.whandle.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