[arch-commits] Commit in qt6-quick3d/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Thu Jul 1 16:08:51 UTC 2021
Date: Thursday, July 1, 2021 @ 16:08:51
Author: arojas
Revision: 418849
archrelease: copy trunk to extra-x86_64
Added:
qt6-quick3d/repos/extra-x86_64/PKGBUILD
(from rev 418848, qt6-quick3d/trunk/PKGBUILD)
qt6-quick3d/repos/extra-x86_64/qt6-3d-gcc11.patch
(from rev 418848, qt6-quick3d/trunk/qt6-3d-gcc11.patch)
Deleted:
qt6-quick3d/repos/extra-x86_64/PKGBUILD
qt6-quick3d/repos/extra-x86_64/qt6-3d-gcc11.patch
--------------------+
PKGBUILD | 76 +++++++++++++++++++++++++--------------------------
qt6-3d-gcc11.patch | 46 +++++++++++++++---------------
2 files changed, 61 insertions(+), 61 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-01 16:08:41 UTC (rev 418848)
+++ PKGBUILD 2021-07-01 16:08:51 UTC (rev 418849)
@@ -1,38 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt6-quick3d
-_qtver=6.1.1
-pkgver=${_qtver/-/}
-pkgrel=1
-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=(qt6-declarative)
-makedepends=(cmake vulkan-headers qt6-shadertools)
-# TODO: use system assimp again when a new version is released
-optdepends=('qt6-shadertools: for shadergen')
-groups=(qt6)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- qt6-3d-gcc11.patch)
-sha256sums=('94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c'
- 'b056d66a24956755c2aaddc4adddd71f5a945ff9795b0cbf9f43ab4d43b4f8f5')
-
-prepare() {
- patch -d $_pkgfn -p1 < qt6-3d-gcc11.patch # Fix build with GCC 11
-}
-
-build() {
- cmake -B build -S $_pkgfn
- 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-quick3d/repos/extra-x86_64/PKGBUILD (from rev 418848, qt6-quick3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-01 16:08:51 UTC (rev 418849)
@@ -0,0 +1,38 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt6-quick3d
+_qtver=6.1.2
+pkgver=${_qtver/-/}
+pkgrel=1
+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=(qt6-declarative)
+makedepends=(cmake vulkan-headers qt6-shadertools)
+# TODO: use system assimp again when a new version is released
+optdepends=('qt6-shadertools: for shadergen')
+groups=(qt6)
+_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
+source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+ qt6-3d-gcc11.patch)
+sha256sums=('b0af0b42ff1b126675b7844946fa2748ea5c63e0f92b46974b0ad18f3136d389'
+ 'b056d66a24956755c2aaddc4adddd71f5a945ff9795b0cbf9f43ab4d43b4f8f5')
+
+prepare() {
+ patch -d $_pkgfn -p1 < qt6-3d-gcc11.patch # Fix build with GCC 11
+}
+
+build() {
+ cmake -B build -S $_pkgfn
+ 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-07-01 16:08:41 UTC (rev 418848)
+++ qt6-3d-gcc11.patch 2021-07-01 16:08:51 UTC (rev 418849)
@@ -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;
Copied: qt6-quick3d/repos/extra-x86_64/qt6-3d-gcc11.patch (from rev 418848, qt6-quick3d/trunk/qt6-3d-gcc11.patch)
===================================================================
--- qt6-3d-gcc11.patch (rev 0)
+++ qt6-3d-gcc11.patch 2021-07-01 16:08:51 UTC (rev 418849)
@@ -0,0 +1,23 @@
+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;
More information about the arch-commits
mailing list