extra/qt5-base to 5.9.0-2

extra/qt5-base/PKGBUILD

@@ -9,16 +9,16 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.8.0
+_qtver=5.9.0
 pkgver=${_qtver/-/}
-pkgrel=12
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
-         'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
-         'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
+         'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
+         'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
              'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -32,15 +32,11 @@ conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
-        plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
-        plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
-        plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
-         '160fde81fe882c4241f04634f53691ad'
-         '078d8a051c06abf28451fd2cdb7f19ce'
-         '92daaa3ebd7cf10ee725b963e44c95a7'
-         '76ab122615f1ba2d68c83477f82e389e')
+        qtbug-61140.patch::"https://github.com/qt/qtbase/commit/744fd39e.patch"
+        qtbug-60558.patch::"https://github.com/qt/qtbase/commit/f45c6c18.patch")
+sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c'
+            'a00d8a0284e0c774c00dc72277edc63579212476ec1d4ebb6246bfd1035e3e4a'
+            'e9d5189baf7a1d8957bd5b00474732412377ac761128e99066aa3314626f7989')
 
 prepare() {
   cd ${_pkgfqn}
@@ -56,13 +52,13 @@ prepare() {
   find . -name '*.py' -exec sed -i \
     's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
 
-  # Fix logging to systemd journal
-  patch -p1 -i ../qt5-base-journald.patch
+  # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
+  sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
 
-  # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
-  patch -p1 -i ../plasma-crash-1.patch
-  patch -p1 -i ../plasma-crash-2.patch
-  patch -p1 -i ../plasma-crash-3.patch
+  # Don't destroy foreign windows
+  patch -p1 -i ../qtbug-61140.patch
+  # Fix crashes with QtCurve
+  patch -p1 -i ../qtbug-60558.patch
 }
 
 build() {

extra/qt5-base/rebuild.list

@@ -9,6 +9,8 @@ lxqt-qtplugin
 pyqt5 *
 deepin-qt5integration *
 deepin-tool-kit *
+deepin-file-manager *
 qt5ct
 
+libqtxdg *
 * - Also need rebuild for patch Qt version updates