diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/transmission')
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/transmission_git.bb | 39 |
2 files changed, 21 insertions, 58 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 @@ -From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 11 May 2020 17:01:35 +0000 -Subject: [PATCH] configure.ac: Fix no libsystemd-daemon - -Replace libsystemd-daemon with libsystemd. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df8cb5007..9a6fb9b2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,10 +249,10 @@ 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.])] -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] - )] - ) - ]) -@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then - GETTEXT_PACKAGE=transmission-gtk - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -- AM_GLIB_GNU_GETTEXT - transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(transmissionlocaledir) - fi --- -2.17.1 - diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 412bd9d3fa..735db1441e 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -1,31 +1,30 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" SECTION = "network" HOMEPAGE = "https://transmissionbt.com/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0dd9fcdc1416ff123c41c785192a1895" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" -RDEPENDS_${PN}-web = "${PN}" +RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ - git://github.com/transmission/transmission \ - file://0001-configure.ac-Fix-no-libsystemd-daemon.patch \ + gitsm://github.com/transmission/transmission;branch=master;protocol=https \ file://transmission-daemon \ " -# Transmission release 2.94 -SRCREV = "d8e60ee44f4295935bd98bf741f85ed19f5a7dfb" -PV = "2.94" +# Transmission release 3.00 +SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd" +PV = "3.00" S = "${WORKDIR}/git" -inherit autotools gettext update-rc.d systemd mime-xdg +inherit autotools-brokensep gettext update-rc.d pkgconfig systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," # Weak default values for transmission user and group # Change them in bbappend if needed @@ -34,15 +33,19 @@ TRANSMISSION_GROUP ??= "root" # Configure aborts with: # config.status: error: po/Makefile.in.in was not created by intltoolize. -B = "${S}" -do_configure_prepend() { +do_configure() { sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac cd ${S} ./update-version-h.sh intltoolize --copy --force --automake + aclocal + libtoolize --automake --copy --force + autoconf + automake -a + oe_runconf } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon install -d ${D}${sysconfdir}/init.d @@ -59,12 +62,12 @@ do_install_append() { PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" -FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" -FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" -FILES_${PN}-web = "${datadir}/transmission/web" -FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon" +FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" +FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" +FILES:${PN}-web = "${datadir}/transmission/web" +FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" -SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" +SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" # Script transmission-daemon following the guidelines in: # https://trac.transmissionbt.com/wiki/Scripts/initd |