[arch-commits] Commit in transmission/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, March 2, 2016 @ 10:02:25
  Author: bpiotrowski
Revision: 260504

upgpkg: transmission 2.90-2

correctly link against libsystemd (FS#48396)

Added:
  transmission/trunk/transmission-2.90-libsystemd.patch
Modified:
  transmission/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   51 +++++++++++++++++++++--------------
 transmission-2.90-libsystemd.patch |   13 ++++++++
 2 files changed, 44 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-02 08:00:54 UTC (rev 260503)
+++ PKGBUILD	2016-03-02 09:02:25 UTC (rev 260504)
@@ -5,44 +5,53 @@
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.90
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz)
-md5sums=('0792c67fcbf722f7823e964e09eb16bc')
+makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent' 'systemd')
+source=(https://download.transmissionbt.com/files/transmission-${pkgver}.tar.xz
+        transmission-2.90-libsystemd.patch)
+md5sums=('0792c67fcbf722f7823e964e09eb16bc'
+         'bcb54fdb9fec00992960d9bd3b449d4d')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -p1 -i "$srcdir/transmission-2.90-libsystemd.patch"
+  autoreconf -fi
+}
+
 build() {
   cd $pkgbase-$pkgver
-
   ./configure --prefix=/usr
   make
-  pushd qt
+
+  cd qt
   qmake qtr.pro
   make
 }
+
 package_transmission-cli() {
-  pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
-  depends=('curl' 'libevent' 'systemd')
+  pkgdesc='Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)'
+  depends=('curl' 'libevent' 'libsystemd')
   install=transmission-cli.install
 
   cd $pkgbase-$pkgver
 
-  for dir in daemon cli web utils
-  do
-      make -C "$dir" DESTDIR="$pkgdir" install
+  for dir in daemon cli web utils; do
+    make -C "$dir" DESTDIR="$pkgdir" install
   done
 
-  install -D -m644 "$srcdir/transmission-$pkgver/daemon/transmission-daemon.service" "$pkgdir/usr/lib/systemd/system/transmission.service"
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
+  install -Dm644 daemon/transmission-daemon.service \
+    "$pkgdir/usr/lib/systemd/system/transmission.service"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
 }
 
 package_transmission-gtk() {
-  pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
+  pkgdesc='Fast, easy, and free BitTorrent client (GTK+ GUI)'
   depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
   optdepends=('notification-daemon: Desktop notification support'
-  	      'transmission-cli: daemon and web support')
+              'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
   cd $pkgbase-$pkgver
@@ -49,11 +58,11 @@
 
   make -C gtk DESTDIR="$pkgdir" install
   make -C po DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
 }
 
 package_transmission-qt() {
-  pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
+  pkgdesc='Fast, easy, and free BitTorrent client (Qt GUI)'
   depends=('curl' 'qt5-base' 'libevent')
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
@@ -62,7 +71,9 @@
 
   make -C qt INSTALL_ROOT="$pkgdir"/usr install
 
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
-  install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
-  install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
+  install -Dm644 qt/icons/transmission.png \
+    "$pkgdir/usr/share/pixmaps/transmission-qt.png"
+  install -Dm644 qt/transmission-qt.desktop \
+    "$pkgdir/usr/share/applications/transmission-qt.desktop"
 }

Added: transmission-2.90-libsystemd.patch
===================================================================
--- transmission-2.90-libsystemd.patch	                        (rev 0)
+++ transmission-2.90-libsystemd.patch	2016-03-02 09:02:25 UTC (rev 260504)
@@ -0,0 +1,13 @@
+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.])]