Version 4.00beta.2

2 files changed, 49 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5446ee9ee749..950384a7545a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,31 @@
 pkgbase = transmission4
-	pkgver = 4.00beta.1
+	pkgver = 4.00beta.2
 	pkgrel = 1
 	url = http://www.transmissionbt.com/
 	arch = x86_64
 	license = GPL
-	makedepends = gtk3
+	makedepends = gtk4
+	makedepends = glibmm-2.68
+	makedepends = gtkmm-4.0
 	makedepends = intltool
 	makedepends = curl
 	makedepends = qt5-base
 	makedepends = libevent
 	makedepends = systemd
 	makedepends = qt5-tools
-	makedepends = libappindicator-gtk3
 	makedepends = dht
 	makedepends = libb64
 	makedepends = miniupnpc
+	makedepends = libdeflate
 	makedepends = libnatpmp
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = yarn
-	source = https://github.com/transmission/transmission-releases/raw/master/transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz
+	source = https://github.com/transmission/transmission-releases/raw/master/transmission-4.0.0-beta.2+rbceb368f1b.tar.xz
 	source = transmission-cli.sysusers
 	source = transmission-cli.tmpfiles
 	source = cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch
-	sha256sums = d2263a0a2e4a7841826882524cad345e184c347873b5b3be71cfa217af57ad2a
+	sha256sums = 7731d62cbf33326ff759abd9ee7b603a3f74c7c0c0669e0fc9822a37d288623f
 	sha256sums = 641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2
 	sha256sums = 1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451
 	sha256sums = 0a0afb9a3fb6c7477728b4e13031909c4df937efe16f7051c710ce89ff0d45dc
@@ -36,6 +38,7 @@ pkgname = transmission4-cli
 	depends = libb64
 	depends = miniupnpc
 	depends = libnatpmp
+	depends = libdeflate
 	provides = transmission-cli
 	conflicts = transmission-cli
 
@@ -43,12 +46,13 @@ pkgname = transmission4-gtk
 	pkgdesc = Fast, easy, and free BitTorrent client (GTK+ GUI) (version 4)
 	depends = curl
 	depends = libevent
-	depends = gtk3
+	depends = gtk4
 	depends = hicolor-icon-theme
-	depends = libappindicator-gtk3
 	depends = libb64
 	depends = miniupnpc
 	depends = libnatpmp
+	depends = libdeflate
+	depends = gtkmm-4.0
 	optdepends = libnotify: Desktop notification support
 	optdepends = transmission-cli: daemon and web support
 	provides = transmission-gtk
@@ -62,6 +66,7 @@ pkgname = transmission4-qt
 	depends = libb64
 	depends = miniupnpc
 	depends = libnatpmp
+	depends = libdeflate
 	optdepends = transmission-cli: daemon and web support
 	provides = transmission-qt
 	conflicts = transmission-qt
diff --git a/PKGBUILD b/PKGBUILD
index 4f17332a12ff..183911084a68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,37 @@
 pkgbase=transmission4
 _pkgbase=transmission
 pkgname=(transmission4-cli transmission4-gtk transmission4-qt libtransmission4)
-pkgver=4.00beta.1
-_pkgver=4.0.0-beta.1+r98cf7d9b3c
+pkgver=4.00beta.2
+_pkgver=4.0.0-beta.2+rbceb368f1b
 pkgrel=1
 arch=(x86_64)
 url="http://www.transmissionbt.com/"
 license=(GPL)
-makedepends=(gtk3 intltool curl qt5-base libevent systemd qt5-tools libappindicator-gtk3 dht libb64 miniupnpc libnatpmp cmake ninja yarn)
+makedepends=(
+	gtk4
+	glibmm-2.68
+	gtkmm-4.0
+	intltool
+	curl
+	qt5-base
+	libevent
+	systemd
+	qt5-tools
+	dht
+	libb64
+	miniupnpc
+	libdeflate
+	libnatpmp
+	cmake
+	ninja
+	yarn
+)
 source=(https://github.com/transmission/transmission-releases/raw/master/transmission-${_pkgver}.tar.xz
         transmission-cli.sysusers
         transmission-cli.tmpfiles
         cdc7bd2f15c89fdc58bed2208392dd857cd479d5.patch # https://github.com/transmission/transmission/issues/4088
 )
-sha256sums=('d2263a0a2e4a7841826882524cad345e184c347873b5b3be71cfa217af57ad2a'
+sha256sums=('7731d62cbf33326ff759abd9ee7b603a3f74c7c0c0669e0fc9822a37d288623f'
             '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2'
             '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451'
             '0a0afb9a3fb6c7477728b4e13031909c4df937efe16f7051c710ce89ff0d45dc')
@@ -33,17 +51,27 @@ build() {
 
   cmake -G Ninja -S . -B build \
           -DCMAKE_INSTALL_PREFIX=/usr \
-          -DRUN_CLANG_TIDY=OFF -DUSE_SYSTEM_UTP=OFF -DENABLE_CLI=ON -DENABLE_WEB=ON
+          -DRUN_CLANG_TIDY=OFF  \
+	  -DUSE_SYSTEM_UTP=OFF \
+	  -DENABLE_CLI=ON \
+	  -DENABLE_WEB=ON
   cmake --build build --config Release
 }
 
+check() {
+  cd $_pkgbase-$_pkgver
+
+  cd build
+  ctest -j $(nproc)
+}
+
 _install_component() {
   (cd $srcdir/$_pkgbase-$_pkgver/build; DESTDIR="$pkgdir" ninja $1/install)
 }
 
 package_transmission4-cli() {
   pkgdesc='Fast, easy, and free BitTorrent client (CLI tools, daemon and web client) (version 4)'
-  depends=(curl libevent systemd libb64 miniupnpc libnatpmp)
+  depends=(curl libevent systemd libb64 miniupnpc libnatpmp libdeflate)
   provides=(transmission-cli)
   conflicts=(transmission-cli)
 
@@ -61,11 +89,12 @@ package_transmission4-cli() {
     "$pkgdir/usr/lib/sysusers.d/transmission.conf"
   install -Dm644 "$srcdir/transmission-cli.tmpfiles" \
     "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
+  rm -rf "$pkgdir/usr/local"
 }
 
 package_transmission4-gtk() {
   pkgdesc='Fast, easy, and free BitTorrent client (GTK+ GUI) (version 4)'
-  depends=(curl libevent gtk3 hicolor-icon-theme libappindicator-gtk3 libb64 miniupnpc libnatpmp)
+  depends=(curl libevent gtk4 hicolor-icon-theme libb64 miniupnpc libnatpmp libdeflate gtkmm-4.0)
   optdepends=('libnotify: Desktop notification support'
               'transmission-cli: daemon and web support')
   provides=(transmission-gtk)
@@ -80,7 +109,7 @@ package_transmission4-gtk() {
 
 package_transmission4-qt() {
   pkgdesc='Fast, easy, and free BitTorrent client (Qt GUI) (version 4)'
-  depends=(curl qt5-base libevent libb64 miniupnpc libnatpmp)
+  depends=(curl qt5-base libevent libb64 miniupnpc libnatpmp libdeflate)
   optdepends=('transmission-cli: daemon and web support')
   provides=(transmission-qt)
   conflicts=(transmission-qt)