fix deps, enhance pkgver(), use KDE Gitlab src, remove unneeded install script and 2 dead plugins

4 files changed, 101 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5fa213c3968..eb6f71e193ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,44 @@
 pkgbase = choqok-git
 	pkgdesc = Microblogging client for KDE with support for Pump.io, GNU social and Twitter.com - git version
-	pkgver = v1.6.0.r106.gd8a53169
+	pkgver = 1.7.0.r279.g8603afb2
 	pkgrel = 1
 	url = https://choqok.kde.org/
-	install = choqok-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = extra-cmake-modules
 	makedepends = git
-	makedepends = kdoctools
+	makedepends = kdoctools5
 	makedepends = python
 	makedepends = qca-qt5
-	depends = knotifyconfig
-	depends = kcmutils
+	depends = attica5
+	depends = gcc-libs
+	depends = glibc
+	depends = hicolor-icon-theme
+	depends = kcmutils5
+	depends = kconfig5
+	depends = kconfigwidgets5
+	depends = kcoreaddons5
 	depends = kemoticons
+	depends = kglobalaccel5
+	depends = kguiaddons5
+	depends = ki18n5
+	depends = kio5
+	depends = kjobwidgets5
+	depends = knotifications5
+	depends = knotifyconfig5
+	depends = kservice5
+	depends = ktextwidgets5
+	depends = kwallet5
+	depends = kwidgetsaddons5
+	depends = kxmlgui5
+	depends = purpose5
+	depends = qt5-base
 	depends = qt5-networkauth
+	depends = sonnet5
 	provides = choqok
 	conflicts = choqok
-	replaces = choqok-frameworks-git
-	source = git+https://github.com/KDE/choqok.git
-	sha256sums = SKIP
+	source = choqok::git+https://invent.kde.org/network/choqok.git
+	b2sums = SKIP
 
 pkgname = choqok-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..799ace7ea264
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg/
+src/
+*.pkg.tar.xz
+*.pkg.tar.zst
+*~
diff --git a/PKGBUILD b/PKGBUILD
index a9205530655d..6a8160c4159c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,92 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Michael Düll <mail@akurei.me> PGP-Key: 6D666EC8
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 # Contributor: Roozbeh Shafiee <Roozbeh@Roozbeh.us>
 
-pkgname=choqok-git
-pkgver=v1.6.0.r106.gd8a53169
+_pkgbase=choqok
+pkgname="${_pkgbase}-git"
+pkgver=1.7.0.r279.g8603afb2
 pkgrel=1
 pkgdesc='Microblogging client for KDE with support for Pump.io, GNU social and Twitter.com - git version'
 arch=(i686 x86_64)
 url='https://choqok.kde.org/'
 license=(GPL)
-depends=(knotifyconfig kcmutils kemoticons qt5-networkauth)
-makedepends=(extra-cmake-modules git kdoctools python qca-qt5)
-conflicts=(choqok)
-provides=(choqok)
-replaces=(choqok-frameworks-git)
-source=("git+https://github.com/KDE/choqok.git")
-install=$pkgname.install
-sha256sums=('SKIP')
+depends=(
+  attica5
+  gcc-libs
+  glibc
+  hicolor-icon-theme
+  kcmutils5
+  kconfig5
+  kconfigwidgets5
+  kcoreaddons5
+  kemoticons
+  kglobalaccel5
+  kguiaddons5
+  ki18n5
+  kio5
+  kjobwidgets5
+  knotifications5
+  knotifyconfig5
+  kservice5
+  ktextwidgets5
+  kwallet5
+  kwidgetsaddons5
+  kxmlgui5
+  purpose5
+  qt5-base
+  qt5-networkauth
+  sonnet5
+)
+makedepends=(
+  extra-cmake-modules
+  git
+  kdoctools5
+  python
+  qca-qt5
+)
+provides=("${_pkgbase}")
+conflicts=("${_pkgbase}")
+source=(""${_pkgbase}"::git+https://invent.kde.org/network/choqok.git")
+b2sums=('SKIP')
 
-pkgver() {
-  cd choqok
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+prepare() {
+  echo "Removing the defunct TelepathyQt plugin..."
+  rm -rfv "${_pkgbase}/plugins/imstatus/"
+  sed -e 's/add_subdirectory(imstatus)//' \
+    -i "${_pkgbase}/plugins//CMakeLists.txt"
+  echo "Removing the defunct KdeWebKit / Konqueror plugin..."
+  rm -rfv "${_pkgbase}/plugins/konqueror/"
+  sed -e 's/find_package(KF5Parts)//' \
+    -e 's/find_package(KF5WebKit)//' \
+    -e 's/add_subdirectory(konqueror)//' \
+    -i "${_pkgbase}/plugins//CMakeLists.txt"
 }
 
-prepare() {
-  mkdir -p build
+pkgver() {
+    cd "${_pkgbase}"
+
+    # Generate git tag based version. Count only proper (v)#.#* [#=number] tags.
+    local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') 
+
+    # Format git-based version for pkgver
+    # Expected format: e.g. 1.5.0rc2.r521.g99982a1c
+    echo "${_gitversion}" | sed \
+        -e 's|^\([0-9][0-9.]*\)-\([a-zA-Z]\+\)|\1\2|' \
+        -e 's|\([0-9]\+-g\)|r\1|' \
+        -e 's|-|.|g'
 }
 
 build() { 
-  cd build
-  cmake ../choqok \
+  cmake -B build -S "${_pkgbase}" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/choqok-git.install b/choqok-git.install
deleted file mode 100644
index 8bccbee5d4c7..000000000000
--- a/choqok-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_update() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
\ No newline at end of file