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

[Antonio Rojas]

    Date: Sunday, June 6, 2021 @ 21:51:36
  Author: arojas
Revision: 417239

Bump revision

Modified:
  qt5-quick3d/trunk/PKGBUILD
Deleted:
  qt5-quick3d/trunk/qtquick3d-assimp.patch

------------------------+
 PKGBUILD               |   11 ++++-------
 qtquick3d-assimp.patch |   13 -------------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-06 21:48:27 UTC (rev 417238)
+++ PKGBUILD	2021-06-06 21:51:36 UTC (rev 417239)
@@ -3,9 +3,9 @@
 
 pkgname=qt5-quick3d
 _qtver=5.15.2
-pkgver=5.15.2+kde+r18
+pkgver=5.15.2+kde+r19
 pkgrel=1
-_commit=e3dfdf1bed735dc720f08c4a01cdc7ddbe7623f7
+_commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -15,10 +15,8 @@
 optdepends=('assimp: Import from assimp')
 groups=('qt' 'qt5')
 _pkgfqn=qtquick3d
-source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
-        qtquick3d-assimp.patch)
-sha256sums=('SKIP'
-            '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef')
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgfqn
@@ -30,7 +28,6 @@
 
   cd $_pkgfqn
   git revert -n 80196af36528e66826549a8b54d6cc5988db1622 # Revert version bump
-  patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
 }
 
 build() {

Deleted: qtquick3d-assimp.patch
===================================================================
--- qtquick3d-assimp.patch	2021-06-06 21:48:27 UTC (rev 417238)
+++ qtquick3d-assimp.patch	2021-06-06 21:51:36 UTC (rev 417239)
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/assetimporters/assimp/assimp.pro b/src/plugins/assetimporters/assimp/assimp.pro
-index ca5c499..174a075 100644
---- a/src/plugins/assetimporters/assimp/assimp.pro
-+++ b/src/plugins/assetimporters/assimp/assimp.pro
-@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
- include($$OUT_PWD/../qtassetimporters-config.pri)
- 
- qtConfig(system-assimp):!if(cross_compile:host_build) {
--    QMAKE_USE_PRIVATE += assimp
-+    QMAKE_USE_PRIVATE += quick3d-assimp
- } else {
-     include(../../../3rdparty/assimp/assimp.pri)
- }