summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-05-18 11:23:01 +0200
committerMartchus2022-05-18 11:23:01 +0200
commitdc53a74dbe8cfd2c2ee9bbdd96541c03655d9bf0 (patch)
treecdffa227d049cb0f7f5128e820db7bfb35fb0d17
parent55231eba4c5c3afe81b279651de6bf8d90971aca (diff)
downloadaur-dc53a74dbe8cfd2c2ee9bbdd96541c03655d9bf0.tar.gz
Rebase against 5.15.4
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--PKGBUILD.sh.ep2
-rw-r--r--qt3d-sha256.txt2
4 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 506d3038c01a..3f3d0f7a6946 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-3d
pkgdesc = C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)
- pkgver = 5.15.3+kde+r18
+ pkgver = 5.15.4+kde+r17
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -20,7 +20,7 @@ pkgbase = mingw-w64-qt5-3d
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qt3d#commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee
+ source = git+https://invent.kde.org/qt/qt/qt3d#commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
sha256sums = SKIP
pkgname = mingw-w64-qt5-3d
diff --git a/PKGBUILD b/PKGBUILD
index 5e8ff1c8ea06..578db6f158a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,16 +10,16 @@
_qt_module=qt3d
pkgname=mingw-w64-qt5-3d
-pkgver=5.15.3
+pkgver=5.15.4
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
depends=('mingw-w64-qt5-declarative' 'mingw-w64-assimp')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee
+_commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
_basever=$pkgver
-pkgver+=+kde+r18
+pkgver+=+kde+r17
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 8d44eebf041d..eebab983de6a 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -4,7 +4,7 @@
# Contributor: ant32 <antreimer@gmail.com>
% end
\
-pkgver=5.15.3
+pkgver=5.15.4
pkgrel=1
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
diff --git a/qt3d-sha256.txt b/qt3d-sha256.txt
index 8e85980bb17d..cc2ecb636e3a 100644
--- a/qt3d-sha256.txt
+++ b/qt3d-sha256.txt
@@ -1 +1 @@
-03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
+SKIP