From 2045e713186b0a636f4659eb9d2a1eefc110bf0e Mon Sep 17 00:00:00 2001 From: Jason Schonberg Date: Sun, 11 May 2025 01:06:49 -0400 Subject: xfce4-settings: upgrade 4.20.0 -> 4.20.1 Drop unnecessary CFLAGS. They were introduced with xfce4-settings version 4.18.3 to address two errors seen at the time - deprecated declarations and implicit declarations. The error was documented here : https://patchwork.yoctoproject.org/project/oe/patch/20241127005545.86128-1-schonm@gmail.com/ Both of these errors have been addressed. This change to the code base fixed the deprecated declarations: https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/def01fc82caac1cb41d3b7c242efa7f98d48e9a6 This change to the code base fixed the implicit declaration : https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/10e40cdf13f1440d207a50a3f19fc4903da0d80a Changelog: https://gitlab.xfce.org/xfce/xfce4-settings/-/tags/xfce4-settings-4.20.1 Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj --- .../xfce4-settings/xfce4-settings_4.20.0.bb | 37 ---------------------- .../xfce4-settings/xfce4-settings_4.20.1.bb | 36 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb 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 deleted file mode 100644 index 76ce27cc96..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.0.bb +++ /dev/null @@ -1,37 +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[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)}" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb new file mode 100644 index 0000000000..353ea9ed81 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb @@ -0,0 +1,36 @@ +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] = "fd0d602853ea75d94024e5baae2d2bf5ca8f8aa4dad7bfd5d08f9ff8afee77b2" + +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