summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 118883564645..f1c1742bb388 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qt5-3d-git
pkgdesc = Qt5 3D module
- pkgver = 5.15.1.r10.g8470b781f
- pkgrel = 2
+ pkgver = 5.15.9.r0.ge94b0fa39
+ pkgrel = 1
url = https://www.qt.io/
arch = i686
arch = x86_64
@@ -13,10 +13,9 @@ pkgbase = qt5-3d-git
makedepends = vulkan-headers
depends = qt5-declarative
depends = assimp
- provides = qt5-3d
+ provides = qt5-3d=5.15.9.r0.ge94b0fa39
conflicts = qt5-3d
source = git+https://code.qt.io/qt/qt3d.git#branch=5.15
sha256sums = SKIP
pkgname = qt5-3d-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c215259a2ed1..0b28d082f6c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
pkgname=qt5-3d-git
-pkgver=5.15.1.r10.g8470b781f
-pkgrel=2
+pkgver=5.15.9.r0.ge94b0fa39
+pkgrel=1
pkgdesc="Qt5 3D module"
arch=('i686' 'x86_64')
url="https://www.qt.io/"
license=('FDL' 'GPL' 'LGPL' 'custom')
depends=('qt5-declarative' 'assimp')
makedepends=('git' 'vulkan-headers')
-provides=('qt5-3d')
+provides=("qt5-3d=$pkgver")
conflicts=('qt5-3d')
source=("git+https://code.qt.io/qt/qt3d.git#branch=5.15")
sha256sums=('SKIP')
@@ -24,10 +24,10 @@ prepare() {
pkgver() {
cd "qt3d"
- _tag=$(git tag -l --sort -v:refname | head -n1)
+ _tag=$(git tag -l --sort -creatordate | grep -E '^v5\.15[0-9\.]+' | head -n1)
_rev=$(git rev-list --count $_tag..HEAD)
_hash=$(git rev-parse --short HEAD)
- printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//;s/-/_/g'
+ printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//;s/-lts-lgpl//'
}
build() {