From patchwork Thu Mar 28 16:12:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 41607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65F13CD1283 for ; Thu, 28 Mar 2024 16:12:45 +0000 (UTC) Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by mx.groups.io with SMTP id smtpd.web10.441.1711642360908649524 for ; Thu, 28 Mar 2024 09:12:41 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.83, mailfrom: f_l_k@t-online.de) Received: from fwd85.aul.t-online.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout07.t-online.de (Postfix) with SMTP id EA0781A0AF for ; Thu, 28 Mar 2024 17:12:38 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.41.230]) by fwd85.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1rpsMn-150QtN0; Thu, 28 Mar 2024 17:12:37 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCHv7] gnome-user-share: add recipe Date: Thu, 28 Mar 2024 17:12:58 +0100 Message-ID: <20240328161258.1027540-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1711642357-82D859D7-CA285BAC/0/0 CLEAN NORMAL X-TOI-MSGID: c844a5f9-a726-43fe-873f-360a4fe68223 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 28 Mar 2024 16:12:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109674 - add it as runtime dependency to gnome-control-center because without it, the file sharing options are hidden. - configure the paths to fit to openembedded env - add mod_dnssd runtime dependency for apache2 as this is a requirement To enable the feature, PACKAGECONFIG httpd needs to be added. This is not done by default to avoid apache2 runtime dependency just by including this recipe. NOTE: Apache2 httpd doesn't need to be running. It'll get started and stopped on demand by systemd. Signed-off-by: Markus Volk --- .../gnome-control-center_46.0.bb | 2 +- .../gnome-user-share/gnome-user-share_43.0.bb | 24 +++++++++++++++++++ .../recipes-httpd/apache-mod/mod-dnssd_0.6.bb | 20 ++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb create mode 100644 meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb index a691b8d3f..fe9f1efbc 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb @@ -69,4 +69,4 @@ FILES:${PN} += " \ FILES:${PN}-dev += "${datadir}/gettext" -RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper" +RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb new file mode 100644 index 000000000..3ff8f938a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "This is gnome-user-share 43.0, a system for easy sharing of user files." +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + + +DEPENDS = " \ + glib-2.0-native \ + glib-2.0 \ + systemd \ +" + +inherit gnomebase gsettings features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master" +SRCREV = "a0e790aa9494db9d1b1f48b4fc0d2f78e112044d" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "modules" +PACKAGECONFIG[httpd] = "-Dhttpd=/usr/sbin/httpd,,,apache2 mod-dnssd" +PACKAGECONFIG[modules] = "-Dmodules_path=/usr/libexec/apache2/modules" + +FILES:${PN} += "${systemd_user_unitdir}" diff --git a/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb new file mode 100644 index 000000000..5fac0a6ed --- /dev/null +++ b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Avahi Module for Apache2." +HOMEPAGE = "https://0pointer.de/lennart/projects/mod_dnssd/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "apache2 avahi" + +SRC_URI = "git://git.0pointer.de/mod_dnssd;protocol=git;branch=master" +SRCREV = "be2fb9f6158f800685de7a1bc01c39b6cf1fa12c" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--disable-lynx" + +inherit autotools pkgconfig + +do_install() { + install -Dm755 ${S}/src/.libs/mod_dnssd.so ${D}${libexecdir}/apache2/modules/mod_dnssd.so +} +