Date: Saturday, November 20, 2021 @ 15:19:01 Author: arojas Revision: 428688
archrelease: copy trunk to extra-x86_64 Added: qt6-3d/repos/extra-x86_64/PKGBUILD (from rev 428687, qt6-3d/trunk/PKGBUILD) Deleted: qt6-3d/repos/extra-x86_64/PKGBUILD qt6-3d/repos/extra-x86_64/qt6-3d-gcc11.patch --------------------+ PKGBUILD | 62 +++++++++++++++++++++++++-------------------------- qt6-3d-gcc11.patch | 23 ------------------ 2 files changed, 31 insertions(+), 54 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-11-20 15:18:48 UTC (rev 428687) +++ PKGBUILD 2021-11-20 15:19:01 UTC (rev 428688) @@ -1,31 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt6-3d -_qtver=6.2.1 -pkgver=${_qtver/-/} -pkgrel=1 -arch=(x86_64) -url='https://www.qt.io' -license=(GPL3 LGPL3 FDL custom) -pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics' -depends=(qt6-base) -makedepends=(cmake ninja qt6-declarative qt6-shadertools) # assimp -optdepends=('qt6-shadertools: RHI renderer' 'qt6-declarative: QML bindings') -groups=(qt6) -_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" -source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3') - -build() { - cmake -B build -S $_pkgfn -G Ninja - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname -} Copied: qt6-3d/repos/extra-x86_64/PKGBUILD (from rev 428687, qt6-3d/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-11-20 15:19:01 UTC (rev 428688) @@ -0,0 +1,31 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt6-3d +_qtver=6.2.1 +pkgver=${_qtver/-/} +pkgrel=2 +arch=(x86_64) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics' +depends=(qt6-base) +makedepends=(cmake ninja qt6-declarative qt6-shadertools assimp) +optdepends=('qt6-shadertools: RHI renderer' 'qt6-declarative: QML bindings' 'assimp: assimp importer plugin') +groups=(qt6) +_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" +source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) +sha256sums=('730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3') + +build() { + cmake -B build -S $_pkgfn -G Ninja + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname +} Deleted: qt6-3d-gcc11.patch =================================================================== --- qt6-3d-gcc11.patch 2021-11-20 15:18:48 UTC (rev 428687) +++ qt6-3d-gcc11.patch 2021-11-20 15:19:01 UTC (rev 428688) @@ -1,23 +0,0 @@ -diff -ru qt3d-everywhere-src-6.1.1.orig/src/3rdparty/assimp/src/include/assimp/Importer.hpp qt3d-everywhere-src-6.1.1/src/3rdparty/assimp/src/include/assimp/Importer.hpp ---- qt3d-everywhere-src-6.1.1.orig/src/3rdparty/assimp/src/include/assimp/Importer.hpp 2021-06-07 08:29:23.902950055 +0000 -+++ qt3d-everywhere-src-6.1.1/src/3rdparty/assimp/src/include/assimp/Importer.hpp 2021-06-07 08:30:51.924838527 +0000 -@@ -59,6 +59,8 @@ - // Public ASSIMP data structures - #include <assimp/types.h> - -+#include <exception> -+ - namespace Assimp { - // ======================================================================= - // Public interface to Assimp -diff -ru qt3d-everywhere-src-6.1.1.orig/src/3rdparty/assimp/src/code/Common/Importer.h qt3d-everywhere-src-6.1.1/src/3rdparty/assimp/src/code/Common/Importer.h ---- qt3d-everywhere-src-6.1.1.orig/src/3rdparty/assimp/src/code/Common/Importer.h 2021-06-07 08:34:37.598230479 +0000 -+++ qt3d-everywhere-src-6.1.1/src/3rdparty/assimp/src/code/Common/Importer.h 2021-06-07 08:35:11.893602448 +0000 -@@ -47,6 +47,7 @@ - #include <map> - #include <vector> - #include <string> -+#include <exception> - #include <assimp/matrix4x4.h> - - struct aiScene;