From aaaa9680861906480ee56920d93b1c50999f1f1c Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 13 Mar 2025 15:19:16 +0800 Subject: [PATCH] xfce4-session: 4.18.4 -> 4.20.0 Upgrade xfce4-session from 4.18.4 to 4.20.0: * rebase 0001-configure.in-hard-code-path-to-iceauth.patch * add dependency libxfce4windowing Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- ...nfigure.in-hard-code-path-to-iceauth.patch | 37 ++++++++++--------- ...sion_4.18.4.bb => xfce4-session_4.20.0.bb} | 7 +++- 2 files changed, 25 insertions(+), 19 deletions(-) rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.18.4.bb => xfce4-session_4.20.0.bb} (78%) diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch index d619cde6ca..0e20143f10 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch @@ -12,29 +12,32 @@ not at run-time. Upstream-Status: Inappropriate [config] Signed-off-by: Andreas Müller + +Rebase for xfce4-session 4.20.0. + +Signed-off-by: Kai Kang --- - configure.ac | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) + configure.ac | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 3cf3510..505e744 100644 +index 81b362f..ccde685 100644 --- a/configure.ac +++ b/configure.ac -@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default]) - dnl Check for linker optimizations - XDT_FEATURE_LINKER_OPTS() +@@ -136,13 +136,7 @@ if test x"$ENABLE_X11" = x"yes"; then + AC_CHECK_FUNCS([_IceTransNoListen]) + LIBS="$ac_LIBS" --dnl Check for iceauth --AC_PATH_PROG([ICEAUTH], [iceauth]) --if test x"$ICEAUTH" != x""; then -- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) --else -- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) --fi -+AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) +- dnl Check for iceauth +- AC_PATH_PROG([ICEAUTH], [iceauth]) +- if test x"$ICEAUTH" != x""; then +- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) +- else +- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) +- fi ++ AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) - dnl Find a location for the session desktop file - AC_MSG_CHECKING([what xsession-prefix to use]) + dnl Find a location for the session desktop file + AC_MSG_CHECKING([what xsession-prefix to use]) -- 1.7.4.4 - diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.4.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.0.bb similarity index 78% rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.4.bb rename to meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.0.bb index 7015820785..6ed03efeb9 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.4.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.0.bb @@ -3,18 +3,20 @@ SECTION = "x11" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" +DEPENDS = "libwnck3 libsm libxfce4ui libxfce4windowing virtual/libx11" inherit xfce update-alternatives features_check SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "9a9c5074c7338b881a5259d3b643619bf84901360c03478e1a697938ece06516" +SRC_URI[sha256sum] = "5229233fe6ee692361cc28724886c5b08e0216d89f09c42d273191d38fd64f85" REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" +EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen" + ALTERNATIVE:${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" ALTERNATIVE_PRIORITY_${PN} = "150" @@ -22,6 +24,7 @@ ALTERNATIVE_PRIORITY_${PN} = "150" FILES:${PN} += " \ ${libdir}/xfce4/*/*/*.so \ ${libdir}/xfce4/session/*-*-* \ + ${datadir}/wayland-sessions \ ${datadir}/xsessions \ ${datadir}/themes/Default/balou/* \ ${datadir}/polkit-1 \