[arch-commits] Commit in qt6-base/kde-unstable (PKGBUILD)

[Antonio Rojas]

    Date: Friday, September 24, 2021 @ 16:37:28
  Author: arojas
Revision: 424669

Use patch instead of cmake flag

Modified:
  qt6-base/kde-unstable/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-24 16:34:00 UTC (rev 424668)
+++ PKGBUILD	2021-09-24 16:37:28 UTC (rev 424669)
@@ -26,14 +26,16 @@
 _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
 source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
         qt6-base-cflags.patch
-        qt6-base-nostrip.patch)
+        qt6-base-nostrip.patch
+        qtbug-96392.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=5c7b3db32bf383afa00050370222f39e0f3083ca)
 sha256sums=('a4fc0c542f7836f8d6c02abeb1fb7869e212689b4c35b57758e3a796a92fcff9'
             'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
             '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
 
 prepare() {
-  patch -d $_pkgfn -p1 -i ../qt6-base-cflags.patch # Use system CFLAGS
-  patch -d $_pkgfn -p1 -i ../qt6-base-nostrip.patch # Don't strip binaries with qmake
+  patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
+  patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
+  patch -d $_pkgfn -p1 < qtbug-96392.patch # https://bugreports.qt.io/browse/QTBUG-96392
 }
 
 build() {
@@ -50,8 +52,7 @@
     -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
     -DQT_FEATURE_journald=ON \
     -DQT_FEATURE_openssl_linked=ON \
-    -DQT_FEATURE_system_sqlite=ON \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DUSE_X11" # https://bugreports.qt.io/browse/QTBUG-96392
+    -DQT_FEATURE_system_sqlite=ON
   cmake --build build
 }