[arch-commits] Commit in qt5-quick3d/trunk (PKGBUILD qtbug-90564.patch)

[Antonio Rojas]

    Date: Tuesday, May 4, 2021 @ 06:58:17
  Author: arojas
Revision: 414308

Switch to KDE maintenance branch

Modified:
  qt5-quick3d/trunk/PKGBUILD
Deleted:
  qt5-quick3d/trunk/qtbug-90564.patch

-------------------+
 PKGBUILD          |   26 +++++++++++++++-----------
 qtbug-90564.patch |   21 ---------------------
 2 files changed, 15 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-04 06:55:46 UTC (rev 414307)
+++ PKGBUILD	2021-05-04 06:58:17 UTC (rev 414308)
@@ -3,30 +3,34 @@
 
 pkgname=qt5-quick3d
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+pkgver=5.15.2+kde+r18
+pkgrel=1
+_commit=e3dfdf1bed735dc720f08c4a01cdc7ddbe7623f7
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Qt module and API for defining 3D content in Qt Quick'
 depends=('qt5-declarative')
-makedepends=('assimp')
+makedepends=('assimp' 'git')
 optdepends=('assimp: Import from assimp')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         qtquick3d-assimp.patch
-         qtbug-90564.patch)
-sha256sums=('5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb'
-            '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef'
-            '7301fbdd7d4d5fbcbb1f5e2567ae231d2fc1682a0f0620589930946c49535c10')
+_pkgfqn=qtquick3d
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        qtquick3d-assimp.patch)
+sha256sums=('SKIP'
+            '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef')
 
+pkgver() {
+  cd $_pkgfqn
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
+
 prepare() {
   mkdir -p build
 
   cd $_pkgfqn
+  git revert -n 80196af36528e66826549a8b54d6cc5988db1622 # Revert version bump
   patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
-  patch -p1 -i ../qtbug-90564.patch # Fix crash in QML designer if assimp is not installed
 }
 
 build() {

Deleted: qtbug-90564.patch
===================================================================
--- qtbug-90564.patch	2021-05-04 06:55:46 UTC (rev 414307)
+++ qtbug-90564.patch	2021-05-04 06:58:17 UTC (rev 414308)
@@ -1,21 +0,0 @@
-diff --git a/src/assetimport/qssgassetimportmanager.cpp b/src/assetimport/qssgassetimportmanager.cpp
-index aec55978..15529f28 100644
---- a/src/assetimport/qssgassetimportmanager.cpp
-+++ b/src/assetimport/qssgassetimportmanager.cpp
-@@ -43,10 +43,12 @@ QSSGAssetImportManager::QSSGAssetImportManager(QObject *parent) : QObject(parent
-     const QStringList keys = QSSGAssetImporterFactory::keys();
-     for (const auto &key : keys) {
-         auto importer = QSSGAssetImporterFactory::create(key, QStringList());
--        m_assetImporters.append(importer);
--        // Add to extension map
--        for (const auto &extension : importer->inputExtensions()) {
--            m_extensionsMap.insert(extension, importer);
-+        if (importer) {
-+            m_assetImporters.append(importer);
-+            // Add to extension map
-+            for (const auto &extension : importer->inputExtensions()) {
-+                m_extensionsMap.insert(extension, importer);
-+            }
-         }
-     }
- }