summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch40
-rw-r--r--meta-oe/recipes-connectivity/transmission/transmission_git.bb15
2 files changed, 7 insertions, 48 deletions
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch b/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch
deleted file mode 100644
index 130ead0842..0000000000
--- a/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001
2From: Leon Anavi <leon.anavi@konsulko.com>
3Date: Mon, 11 May 2020 17:01:35 +0000
4Subject: [PATCH] configure.ac: Fix no libsystemd-daemon
5
6Replace libsystemd-daemon with libsystemd.
7
8Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
9---
10 configure.ac | 5 ++---
11 1 file changed, 2 insertions(+), 3 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index df8cb5007..9a6fb9b2e 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -249,10 +249,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
18 [Add support for systemd startup notification (default is autodetected)]),
19 [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
20 AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
21- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
22+ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
23 [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
24 [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
25- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
26+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
27 )]
28 )
29 ])
30@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then
31 GETTEXT_PACKAGE=transmission-gtk
32 AC_SUBST(GETTEXT_PACKAGE)
33 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
34- AM_GLIB_GNU_GETTEXT
35 transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
36 AC_SUBST(transmissionlocaledir)
37 fi
38--
392.17.1
40
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_git.bb
index 412bd9d3fa..297185de72 100644
--- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb
+++ b/meta-oe/recipes-connectivity/transmission/transmission_git.bb
@@ -2,20 +2,19 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client"
2SECTION = "network" 2SECTION = "network"
3HOMEPAGE = "https://transmissionbt.com/" 3HOMEPAGE = "https://transmissionbt.com/"
4LICENSE = "GPL-2.0" 4LICENSE = "GPL-2.0"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0dd9fcdc1416ff123c41c785192a1895" 5LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33"
6 6
7DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" 7DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native"
8RDEPENDS_${PN}-web = "${PN}" 8RDEPENDS_${PN}-web = "${PN}"
9 9
10SRC_URI = " \ 10SRC_URI = " \
11 git://github.com/transmission/transmission \ 11 gitsm://github.com/transmission/transmission \
12 file://0001-configure.ac-Fix-no-libsystemd-daemon.patch \
13 file://transmission-daemon \ 12 file://transmission-daemon \
14" 13"
15 14
16# Transmission release 2.94 15# Transmission release 3.00
17SRCREV = "d8e60ee44f4295935bd98bf741f85ed19f5a7dfb" 16SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd"
18PV = "2.94" 17PV = "3.00"
19 18
20S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
21 20
@@ -25,7 +24,7 @@ PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" 24 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
26 25
27PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," 26PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3,"
28PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd," 27PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd,"
29 28
30# Weak default values for transmission user and group 29# Weak default values for transmission user and group
31# Change them in bbappend if needed 30# Change them in bbappend if needed
@@ -62,7 +61,7 @@ PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web"
62FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" 61FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit"
63FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" 62FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps"
64FILES_${PN}-web = "${datadir}/transmission/web" 63FILES_${PN}-web = "${datadir}/transmission/web"
65FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon" 64FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata"
66 65
67SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" 66SYSTEMD_SERVICE_${PN} = "transmission-daemon.service"
68 67