Update to 3.00

3 files changed, 20 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3522e22584d..1e51fb4fc21e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = transmission-sequential
-	pkgver = 2.94
-	pkgrel = 2
+	pkgver = 3.00
+	pkgrel = 1
 	url = http://www.transmissionbt.com/
 	arch = i686
 	arch = x86_64
@@ -18,12 +18,12 @@ pkgbase = transmission-sequential
 	makedepends = qt5-tools
 	provides = transmission-cli
 	conflicts = transmission-cli
-	source = https://github.com/Mikayex/transmission/archive/2.94-seq.tar.gz
-	source = transmission-2.90-libsystemd.patch
+	source = https://github.com/Mikayex/transmission/archive/3.00-seq.tar.gz
+	source = https://github.com/transmission/transmission-releases/raw/master/transmission-3.00.tar.xz
 	source = transmission-sequential-cli.sysusers
 	source = transmission-sequential-cli.tmpfiles
-	sha256sums = 220ba1b500d13c36ed1e55e90bb2c3d6d4babddcae3b7df08a374617af1b5670
-	sha256sums = 9f8f4bb532e0e46776dbd90e75557364f495ec95896ee35900ea222d69bda411
+	sha256sums = 5e6169d7756de25780f00af2b312c303a054fcda5df2b3300c1d5dc48e3a8107
+	sha256sums = 9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2
 	sha256sums = 641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2
 	sha256sums = 1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451
 
@@ -42,7 +42,7 @@ pkgname = transmission-sequential-gtk
 	depends = gtk3
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
-	optdepends = notification-daemon: Desktop notification support
+	optdepends = libnotify: Desktop notification support
 	optdepends = transmission-sequential-cli: daemon and web support
 	provides = transmission-gtk
 	conflicts = transmission-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 0b17f1714994..f39a838fb53a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,35 +4,38 @@
 
 pkgbase=transmission-sequential
 pkgname=(transmission-sequential-cli transmission-sequential-gtk transmission-sequential-qt)
-pkgver=2.94
-pkgrel=2
+pkgver=3.00
+pkgrel=1
 arch=(i686 x86_64 arm armv6h armv7h aarch64)
 url="http://www.transmissionbt.com/"
 license=(MIT)
 makedepends=(gtk3 intltool curl qt5-base libevent systemd qt5-tools)
 provides=(transmission-cli)
 conflicts=(transmission-cli)
-source=("https://github.com/Mikayex/transmission/archive/${pkgver}-seq.tar.gz"
-        transmission-2.90-libsystemd.patch
+source=(https://github.com/Mikayex/transmission/archive/${pkgver}-seq.tar.gz
+        https://github.com/transmission/transmission-releases/raw/master/transmission-${pkgver}.tar.xz
         transmission-sequential-cli.sysusers
         transmission-sequential-cli.tmpfiles)
-sha256sums=('220ba1b500d13c36ed1e55e90bb2c3d6d4babddcae3b7df08a374617af1b5670'
-            '9f8f4bb532e0e46776dbd90e75557364f495ec95896ee35900ea222d69bda411'
+sha256sums=('5e6169d7756de25780f00af2b312c303a054fcda5df2b3300c1d5dc48e3a8107'
+            '9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2'
             '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2'
             '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451')
 
 prepare() {
+  #Copy third party files from official source package
+  cp -r transmission-$pkgver/third-party/ transmission-$pkgver-seq
+
   cd transmission-$pkgver-seq
-  patch -p1 -i "$srcdir/transmission-2.90-libsystemd.patch"
 
   rm -f m4/glib-gettext.m4
+  AUTOGEN_SUBDIR_MODE=1 ./autogen.sh
+
   sed -i '/^Icon=/ s/$/-qt/' qt/transmission-qt.desktop
 }
 
 build() {
   cd transmission-$pkgver-seq
-  ./autogen.sh --prefix=/usr
-  #./autogen.sh --prefix=/usr --without-gtk
+  ./configure --prefix=/usr
   make
 
   cd qt
@@ -63,7 +66,7 @@ package_transmission-sequential-cli() {
 package_transmission-sequential-gtk() {
   pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI) (+sequential patch)"
   depends=(curl libevent gtk3 desktop-file-utils hicolor-icon-theme)
-  optdepends=('notification-daemon: Desktop notification support'
+  optdepends=('libnotify: Desktop notification support'
   	      'transmission-sequential-cli: daemon and web support')
   provides=(transmission-gtk)
   conflicts=(transmission-gtk)
diff --git a/transmission-2.90-libsystemd.patch b/transmission-2.90-libsystemd.patch
deleted file mode 100644
index 279a2c1a8cb8..000000000000
--- a/transmission-2.90-libsystemd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ea5e296..afd236f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,7 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-             [Add support for systemd startup notification (default is autodetected)]),
-             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
-         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-             [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]