0.29.2.r0: build with qt6

2 files changed, 57 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0a2d7622796..42c3477920fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
 pkgbase = qlog-git
 	pkgdesc = Amateur radio logbook software
-	pkgver = r1197.08f9652
+	pkgver = 0.29.2.r0.ge44fc85
 	pkgrel = 1
 	url = https://github.com/foldynl/QLog
 	arch = x86_64
 	arch = i686
 	license = GPL
 	makedepends = git
-	makedepends = qt5-tools
-	depends = qt5-base
-	depends = qt5-charts
-	depends = qt5-webengine
-	depends = qtkeychain-qt5
-	depends = qt5-serialport
+	makedepends = qt6-tools
+	depends = qt6-base
+	depends = qt6-charts
+	depends = qt6-serialport
+	depends = qt6-webengine
+	depends = qtkeychain-qt6
 	depends = hamlib
 	optdepends = org.freedesktop.secrets: keyring/password support
-	provides = qlog
+	provides = qlog=0.29.2
 	conflicts = qlog
-	source = qlog::git+https://github.com/foldynl/QLog
-	source = flags::git+https://github.com/foldynl/QLog-Flags
+	source = qlog::git+https://github.com/foldynl/QLog.git
+	source = foldynl.qlog-flags::git+https://github.com/foldynl/QLog-Flags.git
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index abe5394c71e2..4bd09a80c7c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,68 +3,81 @@
 
 _pkgname=qlog
 pkgname="$_pkgname-git"
-pkgver=r1197.08f9652
+pkgver=0.29.2.r0.ge44fc85
 pkgrel=1
 pkgdesc="Amateur radio logbook software"
 arch=("x86_64" "i686")
 url="https://github.com/foldynl/QLog"
 license=('GPL')
+
 depends=(
-  'qt5-base'
-  'qt5-charts'
-  'qt5-webengine'
-  'qtkeychain-qt5'
-  'qt5-serialport'
+  'qt6-base'
+  'qt6-charts'
+  'qt6-serialport'
+  'qt6-webengine'
+  'qtkeychain-qt6'
   'hamlib'
 )
 makedepends=(
   'git'
-  'qt5-tools'
+  'qt6-tools'
 )
 optdepends=(
   'org.freedesktop.secrets: keyring/password support'
 )
 
-provides=("$_pkgname")
-conflicts=(${provides[@]})
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
 
-source=(
-  "$_pkgname"::"git+$url"
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"git+$url.git")
+sha256sums=('SKIP')
 
-  # submodule
-  "flags"::"git+https://github.com/foldynl/QLog-Flags"
-)
-sha256sums=(
-  'SKIP'
-  'SKIP'
-)
+_source_qlog() {
+  source+=(
+    'foldynl.qlog-flags'::'git+https://github.com/foldynl/QLog-Flags.git'
+  )
+  sha256sums+=(
+    'SKIP'
+  )
+
+  _prepare_qlog() (
+    cd "${srcdir:?}/$_pkgsrc"
+    local -A _submodules=(
+      ['foldynl.qlog-flags']='res/flags'
+    )
+    _submodule_update
+  )
+}
+
+_source_qlog
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$_pkgsrc"
+  git describe --long --tags --exclude='*[a-zA-Z][a-zA-Z]*' \
+    | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-  # prepare submodules
-  cd "$srcdir/$_pkgname"
-  _submodules=(
-    'res/flags'
-  )
-  for submodule in ${_submodules[@]} ; do
-    mkdir -p "$submodule"
-    git submodule init ${submodule}
-    git submodule set-url ${submodule} "${srcdir}/${submodule##*/}"
-    git -c protocol.file.allow=always submodule update ${submodule}
-  done
+  _submodule_update() {
+    local key;
+    for key in ${!_submodules[@]} ; do
+      git submodule init "${_submodules[${key}]}"
+      git submodule set-url "${_submodules[${key}]}" "${srcdir}/${key}"
+      git -c protocol.file.allow=always submodule update "${_submodules[${key}]}"
+    done
+  }
+
+  _prepare_qlog
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  qmake PREFIX="$pkgdir/usr" QLog.pro
+  cd "$_pkgsrc"
+  qmake6 PREFIX="$pkgdir/usr" QLog.pro
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$_pkgsrc"
   make install
 }