git » qt5-base.git » commit 1e15948

Qt 5.13.1

author Antonio Rojas
2019-09-05 08:51:27 UTC
committer Antonio Rojas
2019-09-05 08:51:27 UTC
parent df620bae6ed7daa1ed371ed3b3c2a29277d330fc

Qt 5.13.1

PKGBUILD +4 -14
virtualbox-focus.patch +0 -13

diff --git a/PKGBUILD b/PKGBUILD
index 697aa25..223afcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.13.0
+_qtver=5.13.1
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,14 +26,8 @@ optdepends=('qt5-svg: to use SVG icon themes'
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"
-        qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77"
-        virtualbox-focus.patch)
-sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
-            '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
-            '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
-            '21c4acce7a789cd0e1e67aca76cf15f536ae8e30ef711a434cfe7ec377556f06')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab')
 
 prepare() {
   cd ${_pkgfqn}
@@ -44,10 +38,6 @@ prepare() {
     mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
     mkspecs/common/g++-unix.conf
-
-  patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
-  patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility
-  patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742
 }
 
 build() {
diff --git a/virtualbox-focus.patch b/virtualbox-focus.patch
deleted file mode 100644
index cc19065..0000000
--- a/virtualbox-focus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9382488b74..1bf1ab268d 100644
---- a/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
-     connection()->setFocusWindow(nullptr);
-     relayFocusToModalWindow();
-     // Do not set the active window to nullptr if there is a FocusIn coming.
--    connection()->focusInTimer().start(400);
-+    connection()->focusInTimer().start(100);
- }
- 
- struct QtMotifWmHints {