[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD qtbug-82547.patch)

[Antonio Rojas]

    Date: Wednesday, March 4, 2020 @ 08:45:03
  Author: arojas
Revision: 376550

Fix build with -no-mimetype-database

Modified:
  qt5-base/kde-unstable/PKGBUILD
Deleted:
  qt5-base/kde-unstable/qtbug-82547.patch

-------------------+
 PKGBUILD          |   14 +++++++++-----
 qtbug-82547.patch |   22 ----------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-04 08:17:11 UTC (rev 376549)
+++ PKGBUILD	2020-03-04 08:45:03 UTC (rev 376550)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0-beta1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,16 +30,19 @@
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
          qt5-base-cflags.patch
-         qtbug-82547.patch)
+         qtbug-82547a.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=ede85452"
+         qtbug-82547b.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=1edf586e")
 sha256sums=('d835c6ba15e1a443bb0114a5eeea4efd512bc74700bb1ae003514d1465cd7b94'
             'c3ccc95178203a4ce2c84862009309ab507dc84e846f30ddd8cea95564a46c01'
-            'd41852acfb5c7eb6415a0efdb3ec9a501ca31ebdddce2311e973854753da2eeb')
+            'd829a91b91f2f0c8c7e50b24ca98a3dca931f5e89f61e5dbd2cbe45ae8d47632'
+            '83ed9cf370078a87ae2dceabc602baccd9a23e6d1aec376344a29cf168ed72d7')
 
 prepare() {
   cd ${_pkgfqn}
 
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-  patch -p1 -i ../qtbug-82547.patch # fix build with system mimetype database
+  patch -p1 -i ../qtbug-82547a.patch # fix build with system mimetype database
+  patch -p1 -i ../qtbug-82547b.patch
 }
 
 build() {
@@ -62,8 +65,9 @@
     -dbus-linked \
     -system-harfbuzz \
     -journald \
+    -no-mimetype-database \
     -no-use-gold-linker \
-    -reduce-relocations # -no-mimetype-database https://bugreports.qt.io/browse/QTBUG-82547
+    -reduce-relocations
   make
 }
 

Deleted: qtbug-82547.patch
===================================================================
--- qtbug-82547.patch	2020-03-04 08:17:11 UTC (rev 376549)
+++ qtbug-82547.patch	2020-03-04 08:45:03 UTC (rev 376550)
@@ -1,22 +0,0 @@
-From 6a0d9896165998ef415c7169dcd8fe7eb2ec41cf Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Thu, 27 Feb 2020 08:08:25 -0800
-Subject: [PATCH] QMimeXMLProvider: add missing semi-colon in the #else case
-
-Fixes: QTBUG-82547
-Change-Id: Ia8b65350cd5d49debca9fffd15f74e22c0536805
----
-
-diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h
-index 0629df8..c4e712b 100644
---- a/src/corelib/mimetypes/qmimeprovider_p.h
-+++ b/src/corelib/mimetypes/qmimeprovider_p.h
-@@ -140,7 +140,7 @@
-     enum : bool { InternalDatabaseAvailable = false };
-     QMimeXMLProvider(QMimeDatabasePrivate *db, InternalDatabaseEnum)
-         : QMimeProviderBase(db, QString())
--    { Q_UNREACHABLE() };
-+    { Q_UNREACHABLE(); };
- #endif
-     QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory);
-     ~QMimeXMLProvider();