git » qt5-tools.git » commit c05b6e3

Rebase on 5.15.3

author Antonio Rojas
2022-03-04 11:12:39 UTC
committer Antonio Rojas
2022-03-04 11:12:39 UTC
parent 565fde6b8dfe6308e6883977e434d18b2738a9b8

Rebase on 5.15.3

PKGBUILD +6 -8

diff --git a/PKGBUILD b/PKGBUILD
index a33e2d0..0252f5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-tools
-pkgver=5.15.2+kde+r17
-pkgrel=6
-_commit=33693a928986006d79c1ee743733cde5966ac402
+_basever=5.15.3
+pkgver=5.15.3+kde+r1
+pkgrel=1
+_commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,7 +15,7 @@ makedepends=('qt5-declarative' 'vulkan-headers' 'clang' 'qt5-webkit' 'git')
 optdepends=('clang: for qdoc' 'qt5-webkit: for Qt Assistant')
 groups=('qt' 'qt5')
 conflicts=('qtchooser')
-_pkgfqn=qttools
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         {assistant,designer,linguist,qdbusviewer}.desktop)
 sha256sums=('SKIP'
@@ -26,14 +27,11 @@ options=(debug)
 
 pkgver() {
   cd $_pkgfqn
-  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
 }
 
 prepare() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n dbe0567470db2b369a9fdb28d9fbac38be3e2d60 # Revert version bump
 }
 
 build() {