From fd2837f3267df4de312960014ecf6983ba84e7f1 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 19 Dec 2024 18:52:20 +0800 Subject: xfce4-settings: 4.18.3 -> 4.20.0 Upgrade xfce4-settings from 4.18.3 to 4.20.0: * remove patch which has been applied in upstream already https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/d1a04d4 * set GDBUS_CODEGEN in EXTRA_OECONF * add PACKAGECONFIG wayland The change log is at: https://gitlab.xfce.org/xfce/xfce4-settings/-/blob/master/NEWS Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../0001-xsettings.xml-Set-default-themes.patch | 41 ---------------------- .../xfce4-settings/xfce4-settings_4.18.3.bb | 32 ----------------- .../xfce4-settings/xfce4-settings_4.20.0.bb | 37 +++++++++++++++++++ 3 files changed, 37 insertions(+), 73 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.3.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch deleted file mode 100644 index 3a4c00913f..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2218ba8a21e9f5715b652c6416c2ddb552686b14 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 20 May 2012 15:22:09 +0200 -Subject: [PATCH] xsettings.xml: Set default themes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller - -Theme Xfce doesn't work as expected. For example, no layout in start -menu and applications' menu bar. And GtkColorButton is blank in config -tab page from xfce4-terminal -> Edit -> Preference -> Colors. - -So use Adwaita as default theme instead. - -Signed-off-by: Kai Kang ---- - xfsettingsd/xsettings.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index d8fe2ac..0f5246b 100644 ---- a/xfsettingsd/xsettings.xml -+++ b/xfsettingsd/xsettings.xml -@@ -6,8 +6,8 @@ - - - -- -- -+ -+ - - - --- -2.1.0 - diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.3.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.3.bb deleted file mode 100644 index f9620d85d0..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.3.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Xfce4 settings" -SECTION = "x11/wm" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" - -inherit xfce features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "2db9e99be503280739a08779503bdf11db8b9db9851c3a981deb449002f3f1a1" - -CFLAGS += " -Wno-deprecated-declarations -Wno-implicit-function-declaration" -EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" - -PACKAGECONFIG ??= " \ - notify \ - ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ -" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" -PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" - -FILES:${PN} += " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RRECOMMENDS:${PN} += "adwaita-icon-theme" -RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" -RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb new file mode 100644 index 0000000000..76ce27cc96 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" + +inherit xfce features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "23548da3429a296501fbfdbc98a861ee241b9fdd47e8d5de1781f57c6bbce5a9" + +CFLAGS += " -Wno-deprecated-declarations -Wno-implicit-function-declaration" +EXTRA_OECONF += " \ + GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \ + --enable-maintainer-mode --disable-debug \ +" + +PACKAGECONFIG ??= " \ + notify \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" +PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native" + +FILES:${PN} += " \ + ${libdir}/xfce4 \ + ${libdir}/gtk-3.0/modules/libxfsettingsd-gtk-settings-sync.so \ + ${datadir}/xfce4 \ +" + +RRECOMMENDS:${PN} += "adwaita-icon-theme" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" -- cgit v1.2.3-54-g00ecf