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

[Antonio Rojas]

    Date: Monday, May 11, 2020 @ 07:03:09
  Author: arojas
Revision: 383161

Fix build

Added:
  qt5-quick3d/kde-unstable/qtquick3d-assimp.patch
Modified:
  qt5-quick3d/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-11 06:23:48 UTC (rev 383160)
+++ PKGBUILD	2020-05-11 07:03:09 UTC (rev 383161)
@@ -14,11 +14,16 @@
 optdepends=('assimp: Import from assimp')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('241f2727202dbfd2cd1f7f15160e9643e2f8c88dfce467318aa789138adfc320')
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+         qtquick3d-assimp.patch)
+sha256sums=('241f2727202dbfd2cd1f7f15160e9643e2f8c88dfce467318aa789138adfc320'
+            '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef')
 
 prepare() {
   mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
 }
 
 build() {

Added: qtquick3d-assimp.patch
===================================================================
--- qtquick3d-assimp.patch	                        (rev 0)
+++ qtquick3d-assimp.patch	2020-05-11 07:03:09 UTC (rev 383161)
@@ -0,0 +1,13 @@
+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)
+ }