sync with community/qbittorrent

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 57 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0128b97c485..212a761d0320 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
 pkgbase = qbittorrent-git
-	pkgdesc = A bittorrent client powered by C++, Qt5 and the good libtorrent library (development version)
-	pkgver = 4.1.5.r568.gfb6bb932d
+	pkgver = 4.4.0rc1.r164.g78eaa49cd
 	pkgrel = 1
-	url = https://www.qbittorrent.org/
-	arch = i686
+	url = https://www.qbittorrent.org
 	arch = x86_64
 	license = custom
 	license = GPL
-	makedepends = boost
 	makedepends = git
-	makedepends = qt5-tools
+	makedepends = cmake
+	makedepends = boost
+	makedepends = qt6-tools
+	makedepends = qt6-svg
 	depends = libtorrent-rasterbar
-	depends = qt5-base
-	depends = qt5-svg
+	depends = qt6-base
 	optdepends = python: needed for torrent search tab
-	provides = qbittorrent
-	conflicts = qbittorrent
-	source = qbittorrent::git+https://github.com/qbittorrent/qBittorrent.git
+	source = qbittorrent-git::git+https://github.com/qbittorrent/qBittorrent.git
 	sha256sums = SKIP
 
 pkgname = qbittorrent-git
-
+	pkgdesc = An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar (development version)
+	depends = libtorrent-rasterbar
+	depends = qt6-base
+	depends = qt6-svg
+	depends = hicolor-icon-theme
+	provides = qbittorrent
+	conflicts = qbittorrent
diff --git a/PKGBUILD b/PKGBUILD
index 1945877d9d5d..838ce9f31518 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,56 @@
-# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
-# Maintainer: Eschwartz <eschwartz@archlinux.org>
-# Contributors: Ner0, Sevenseven
-
-# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
-
-pkgname=qbittorrent-git
-pkgver=4.1.5.r568.gfb6bb932d
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Based on community/qbittorrent by Antonio Rojas <arojas@archlinux.org>
+
+# pkgbase=qbittorrent-git
+# pkgname=(qbittorrent-git qbittorrent-nox-git)
+pkgbase=qbittorrent-git
+pkgname=$pkgbase
+pkgver=4.4.0rc1.r164.g78eaa49cd
 pkgrel=1
-pkgdesc="A bittorrent client powered by C++, Qt5 and the good libtorrent library (development version)"
-arch=('i686' 'x86_64')
-url="https://www.qbittorrent.org/"
-license=('custom' 'GPL')
-depends=('libtorrent-rasterbar' 'qt5-base' 'qt5-svg')
-makedepends=('boost' 'git' 'qt5-tools')
+arch=(x86_64)
+url='https://www.qbittorrent.org'
+license=(custom GPL)
+depends=(libtorrent-rasterbar qt6-base)
+makedepends=(git cmake boost qt6-tools qt6-svg)
 optdepends=('python: needed for torrent search tab')
-conflicts=('qbittorrent')
-provides=('qbittorrent')
-source=("${pkgname%-*}::git+https://github.com/qbittorrent/qBittorrent.git")
+source=("$pkgbase::git+https://github.com/qbittorrent/qBittorrent.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd ${pkgname%-*}
+  cd $pkgbase
 
-  _tag=$(git tag -l --sort -v:refname | sed -n '1,1{s/release-//p}')
-  _rev=$(git rev-list --count release-${_tag}..HEAD)
-  _hash=$(git rev-parse --short HEAD)
-  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash"
+  git describe --long --tags | sed 's/^release-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd ${pkgname%-*}
+  cmake -B build -S $pkgbase \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DQT6=ON
+  cmake --build build
+
+  # cmake -B build-nox -S $pkgbase \
+  #   -DCMAKE_INSTALL_PREFIX=/usr \
+  #   -DQT6=ON \
+  #   -DGUI=OFF \
+  #   -DSYSTEMD=ON
+  # cmake --build build-nox
+}
 
-  # tell qmake not to break makepkg's debug/!strip options
-  export QBT_ADD_CONFIG='nostrip'
+package_qbittorrent-git() {
+  pkgdesc='An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar (development version)'
+  depends+=(qt6-svg hicolor-icon-theme)
+  conflicts=('qbittorrent')
+  provides=('qbittorrent')
 
-  ./configure --prefix=/usr
-  make
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 $pkgbase/COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
 }
 
-package() {
-  cd ${pkgname%-*}
+# package_qbittorrent-nox-git() {
+#   pkgdesc='An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar, w/o gui (development version)'
+#   conflicts=('qbittorrent-nox')
+#   provides=('qbittorrent-nox')
 
-  make INSTALL_ROOT="$pkgdir/" install
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
+#   DESTDIR="$pkgdir" cmake --install build-nox
+#   install -Dm644 $pkgbase/COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
+# }