[arch-commits] Commit in qt5-quick3d/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Sunday, June 6, 2021 @ 21:51:49
  Author: arojas
Revision: 417240

archrelease: copy trunk to extra-x86_64

Added:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD
    (from rev 417239, qt5-quick3d/trunk/PKGBUILD)
Deleted:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD
  qt5-quick3d/repos/extra-x86_64/qtquick3d-assimp.patch

------------------------+
 PKGBUILD               |  103 ++++++++++++++++++++++-------------------------
 qtquick3d-assimp.patch |   13 -----
 2 files changed, 50 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-06 21:51:36 UTC (rev 417239)
+++ PKGBUILD	2021-06-06 21:51:49 UTC (rev 417240)
@@ -1,53 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-quick3d
-_qtver=5.15.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' 'git')
-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')
-
-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
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-quick3d/repos/extra-x86_64/PKGBUILD (from rev 417239, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-06 21:51:49 UTC (rev 417240)
@@ -0,0 +1,50 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quick3d
+_qtver=5.15.2
+pkgver=5.15.2+kde+r19
+pkgrel=1
+_commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
+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' 'git')
+optdepends=('assimp: Import from assimp')
+groups=('qt' 'qt5')
+_pkgfqn=qtquick3d
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
+
+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
+}
+
+build() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

Deleted: qtquick3d-assimp.patch
===================================================================
--- qtquick3d-assimp.patch	2021-06-06 21:51:36 UTC (rev 417239)
+++ qtquick3d-assimp.patch	2021-06-06 21:51:49 UTC (rev 417240)
@@ -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)
- }