diff mbox series

[meta-xfce,1/5] xfconf: 4.18.2 -> 4.20.0

Message ID 20241216103618.4078816-1-kai.kang@windriver.com
State Accepted
Headers show
Series [meta-xfce,1/5] xfconf: 4.18.2 -> 4.20.0 | expand

Commit Message

Kai Dec. 16, 2024, 10:36 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

Update xfconf from 4.18.2 to 4.20.0:

* update EXTRA_OECONF to remove legacy perl setting, and add config for
  gdbug-codegen
* handle the systemd service file

The change log is at:

https://gitlab.xfce.org/xfce/xfconf/-/blob/master/NEWS

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../{xfconf_4.18.2.bb => xfconf_4.20.0.bb}    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
 rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.18.2.bb => xfconf_4.20.0.bb} (49%)

Comments

Kai Dec. 19, 2024, 9:53 a.m. UTC | #1
On 12/16/24 18:36, Kai Kang via lists.openembedded.org wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Update xfconf from 4.18.2 to 4.20.0:
>
> * update EXTRA_OECONF to remove legacy perl setting, and add config for
>    gdbug-codegen
> * handle the systemd service file
>
> The change log is at:
>
> https://gitlab.xfce.org/xfce/xfconf/-/blob/master/NEWS
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>   .../{xfconf_4.18.2.bb => xfconf_4.20.0.bb}    | 19 +++++++++++++++----
>   1 file changed, 15 insertions(+), 4 deletions(-)
>   rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.18.2.bb => xfconf_4.20.0.bb} (49%)
>
> diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
> similarity index 49%
> rename from meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb
> rename to meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
> index 39694cd0b..750a40627 100644
> --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb
> +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
> @@ -4,15 +4,26 @@ LICENSE = "GPL-2.0-or-later"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>   DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native"
>   
> -inherit xfce gtk-doc gobject-introspection bash-completion vala
> +inherit xfce gtk-doc gobject-introspection bash-completion vala systemd
>   
> -EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl"
> +EXTRA_OECONF += "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen"
>   
> -SRC_URI[sha256sum] = "dce24fb0555e9718d139c10e714759e03ab4e40a7ffcf3c990f046f7a17213cc"
> +SRC_URI[sha256sum] = "8bc43c60f1716b13cf35fc899e2a36ea9c6cdc3478a8f051220eef0f53567efd"
>   
>   FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \
>                   ${libdir}/gio/modules/libxfconfgsettingsbackend.so \
> -                ${datadir}/dbus-1/services/org.xfce.Xfconf.service"
> +                ${datadir}/dbus-1/services/org.xfce.Xfconf.service \
> +                ${systemd_user_unitdir}/xfconfd.service \
> +                "
> +
Hi Khem,
> +SYSTEMD_SERVICE:${PN} = "xfconfd.service"
> +
> +do_install:append() {
> +    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
> +        rm -f ${D}${systemd_user_unitdir}/xfconfd.service
> +        rmdir --ignore-fail-on-non-empty -p ${D}${systemd_user_unitdir}
> +    fi
> +}

The systemd user mode service file should not handled like this. Please 
drop it and v2 will be sent.

Sorry for inconvenience.

Regards,
Kai

>   
>   FILES:${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la"
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#114326): https://lists.openembedded.org/g/openembedded-devel/message/114326
> Mute This Topic: https://lists.openembedded.org/mt/110142309/3616933
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [kai.kang@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
similarity index 49%
rename from meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb
rename to meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
index 39694cd0b..750a40627 100644
--- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.2.bb
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
@@ -4,15 +4,26 @@  LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native"
 
-inherit xfce gtk-doc gobject-introspection bash-completion vala
+inherit xfce gtk-doc gobject-introspection bash-completion vala systemd
 
-EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl"
+EXTRA_OECONF += "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen"
 
-SRC_URI[sha256sum] = "dce24fb0555e9718d139c10e714759e03ab4e40a7ffcf3c990f046f7a17213cc"
+SRC_URI[sha256sum] = "8bc43c60f1716b13cf35fc899e2a36ea9c6cdc3478a8f051220eef0f53567efd"
 
 FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \
                 ${libdir}/gio/modules/libxfconfgsettingsbackend.so \
-                ${datadir}/dbus-1/services/org.xfce.Xfconf.service"
+                ${datadir}/dbus-1/services/org.xfce.Xfconf.service \
+                ${systemd_user_unitdir}/xfconfd.service \
+                "
+
+SYSTEMD_SERVICE:${PN} = "xfconfd.service"
+
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
+        rm -f ${D}${systemd_user_unitdir}/xfconfd.service
+        rmdir --ignore-fail-on-non-empty -p ${D}${systemd_user_unitdir}
+    fi
+}
 
 FILES:${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la"