Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfdesktop for openSUSE:Factory checked in at 2025-10-27 14:41:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfdesktop (Old) and /work/SRC/openSUSE:Factory/.xfdesktop.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfdesktop" Mon Oct 27 14:41:33 2025 rev:51 rq:1313760 version:4.20.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xfdesktop/xfdesktop.changes 2025-08-21 17:00:59.314134219 +0200 +++ /work/SRC/openSUSE:Factory/.xfdesktop.new.1980/xfdesktop.changes 2025-10-27 14:43:30.420181841 +0100 @@ -1,0 +2,10 @@ +Wed Oct 22 11:13:53 UTC 2025 - Manfred Hollstein <[email protected]> + +- Switch to using meson for building; this allows building this + package even in the upcoming development release Xfce-4.21 +- Refresh 0002-relax-libyaml-version.patch +- Remove bcond_with git and related items +- Ensure installed icon files land in _datadir/wallpapers/xfce, not + in _datadir/backgrounds/xfce which is used by meson + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfdesktop.spec ++++++ --- /var/tmp/diff_new_pack.Zixkit/_old 2025-10-27 14:43:32.372264284 +0100 +++ /var/tmp/diff_new_pack.Zixkit/_new 2025-10-27 14:43:32.372264284 +0100 @@ -16,7 +16,6 @@ # -%bcond_with git Name: xfdesktop Version: 4.20.1 Release: 0 @@ -33,16 +32,17 @@ Patch3: xfdesktop-wayland-get-proper-monitor-name.patch %if 0%{?suse_version} && 0%{?suse_version} < 1550 # Default gcc7 is too old for new C20 features -BuildRequires: gcc13 +BuildRequires: gcc14 %endif BuildRequires: fdupes BuildRequires: gettext >= 0.19.8 +BuildRequires: meson >= 0.56.0 BuildRequires: update-desktop-files -BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(cairo) >= 1.16 BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(exo-2) >= 0.11.0 -BuildRequires: pkgconfig(garcon-1) >= 0.6.0 +BuildRequires: pkgconfig(exo-2) >= 4.18.0 +BuildRequires: pkgconfig(garcon-1) >= 4.18.0 +BuildRequires: pkgconfig(garcon-gtk3-1) >= 4.18.0 BuildRequires: pkgconfig(gdk-wayland-3.0) >= 3.24.10 BuildRequires: pkgconfig(gdk-x11-3.0) >= 3.24.10 BuildRequires: pkgconfig(gio-2.0) >= 2.72.0 @@ -57,12 +57,12 @@ BuildRequires: pkgconfig(libwnck-3.0) >= 3.14 BuildRequires: pkgconfig(libxfce4kbd-private-3) >= 4.18.0 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.0 -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.13.0 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.18.0 BuildRequires: pkgconfig(libxfce4windowing-0) >= 4.19.8 BuildRequires: pkgconfig(libxfce4windowing-x11-0) >= 4.19.8 BuildRequires: pkgconfig(libxfce4windowingui-0) >= 4.19.8 BuildRequires: pkgconfig(libxfconf-0) >= 4.19.3 -BuildRequires: pkgconfig(thunarx-3) >= 4.17.10 +BuildRequires: pkgconfig(thunarx-3) >= 4.18.0 BuildRequires: pkgconfig(x11) >= 1.6.7 BuildRequires: pkgconfig(yaml-0.1) >= 0.1.7 Provides: xfce4-desktop = %{version} @@ -102,26 +102,29 @@ %build %if 0%{?suse_version} && 0%{?suse_version} < 1550 -export CC=gcc-13 +export CC=gcc-14 %endif -%if %{with git} -NOCONFIGURE=1 ./autogen.sh -%configure \ - --enable-maintainer-mode \ - --with-default-backdrop-filename=%{_datadir}/wallpapers/xfce/default.wallpaper -%else -xdt-autogen -%configure \ - --with-default-backdrop-filename=%{_datadir}/wallpapers/xfce/default.wallpaper -%endif -%make_build +%meson \ + -Ddesktop-menu=enabled \ + -Ddesktop-icons=true \ + -Dfile-icons=true \ + -Dthunarx=enabled \ + -Dnotifications=enabled \ + -Dx11=enabled \ + -Dwayland=enabled \ + -Ddefault-backdrop-filename=%{_datadir}/wallpapers/xfce/default.wallpaper \ + -Dtests=false +%meson_build %install -%make_install +%meson_install # default upstream backdrop image -ln -s %{_datadir}/wallpapers/xfce/xfce-blue.jpg \ - %{buildroot}%{_datadir}/wallpapers/xfce/default.wallpaper +mkdir -p %{buildroot}%{_datadir}/wallpapers/ +if [ -d %{buildroot}%{_datadir}/backgrounds/xfce ]; then + mv %{buildroot}%{_datadir}/backgrounds/xfce %{buildroot}%{_datadir}/wallpapers +fi +ln -s xfce-blue.jpg %{buildroot}%{_datadir}/wallpapers/xfce/default.wallpaper %suse_update_desktop_file xfce-backdrop-settings ++++++ 0002-relax-libyaml-version.patch ++++++ --- /var/tmp/diff_new_pack.Zixkit/_old 2025-10-27 14:43:32.524270704 +0100 +++ /var/tmp/diff_new_pack.Zixkit/_new 2025-10-27 14:43:32.564272393 +0100 @@ -1,126 +1,13 @@ -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2025-02-17 09:57:17.000000000 +0100 -+++ b/configure.ac 2025-02-17 11:36:08.511231592 +0100 -@@ -18,7 +18,7 @@ m4_define([thunar_minimum_version], [4.1 - m4_define([xfconf_minimum_version], [4.19.3]) - m4_define([cairo_minimum_version], [1.16]) - m4_define([gtk_layer_shell_minimum_version], [0.7.0]) --m4_define([libyaml_minimum_version], [0.2.5]) -+m4_define([libyaml_minimum_version], [0.1.7]) - - dnl version info - XDT_VERSION_INIT([4.20.1]) -diff -rup a/configure b/configure ---- a/configure 2025-02-17 09:58:19.000000000 +0100 -+++ b/configure 2025-02-17 11:36:44.294229508 +0100 -@@ -22152,11 +22152,11 @@ fi - - - if test x"$xdt_feature_deps_check_only" = x"yes"; then -- if ! $PKG_CONFIG --exists "yaml-0.1 >= 0.2.5" >/dev/null 2>&1; then -+ if ! $PKG_CONFIG --exists "yaml-0.1 >= 0.1.7" >/dev/null 2>&1; then - if test x"$xdt_feature_deps_missing" = x""; then -- xdt_feature_deps_missing="yaml-0.1 >= 0.2.5" -+ xdt_feature_deps_missing="yaml-0.1 >= 0.1.7" - else -- xdt_feature_deps_missing="$xdt_feature_deps_missing, yaml-0.1 >= 0.2.5" -+ xdt_feature_deps_missing="$xdt_feature_deps_missing, yaml-0.1 >= 0.1.7" - fi - fi - else -@@ -22310,9 +22310,9 @@ fi - - - -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for yaml-0.1 >= 0.2.5" >&5 --printf %s "checking for yaml-0.1 >= 0.2.5... " >&6; } -- if $PKG_CONFIG "--atleast-version=0.2.5" "yaml-0.1" >/dev/null 2>&1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for yaml-0.1 >= 0.1.7" >&5 -+printf %s "checking for yaml-0.1 >= 0.1.7... " >&6; } -+ if $PKG_CONFIG "--atleast-version=0.1.7" "yaml-0.1" >/dev/null 2>&1; then - LIBYAML_VERSION=`$PKG_CONFIG --modversion "yaml-0.1"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBYAML_VERSION" >&5 - printf "%s\n" "$LIBYAML_VERSION" >&6; } -@@ -22329,7 +22329,7 @@ printf %s "checking LIBYAML_LIBS... " >& - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBYAML_LIBS" >&5 - printf "%s\n" "$LIBYAML_LIBS" >&6; } - -- LIBYAML_REQUIRED_VERSION=0.2.5 -+ LIBYAML_REQUIRED_VERSION=0.1.7 - - - -@@ -22358,7 +22358,7 @@ printf "%s\n" "found, but $xdt_cv_versio - - echo "*** The required package yaml-0.1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade yaml-0.1 to atleast version 0.2.5, or adjust" -+ echo "*** Please upgrade yaml-0.1 to atleast version 0.1.7, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -22370,7 +22370,7 @@ printf "%s\n" "not found" >&6; } - - - echo "*** The required package yaml-0.1 was not found on your system." -- echo "*** Please install yaml-0.1 (atleast version 0.2.5) or adjust" -+ echo "*** Please install yaml-0.1 (atleast version 0.1.7) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." -@@ -22388,11 +22388,11 @@ printf "%s\n" "not found" >&6; } - - - if test x"$xdt_feature_deps_check_only" = x"yes"; then -- if ! $PKG_CONFIG --exists "yaml-0.1 >= 0.2.5" >/dev/null 2>&1; then -+ if ! $PKG_CONFIG --exists "yaml-0.1 >= 0.1.7" >/dev/null 2>&1; then - if test x"$xdt_feature_deps_missing" = x""; then -- xdt_feature_deps_missing="yaml-0.1 >= 0.2.5" -+ xdt_feature_deps_missing="yaml-0.1 >= 0.1.7" - else -- xdt_feature_deps_missing="$xdt_feature_deps_missing, yaml-0.1 >= 0.2.5" -+ xdt_feature_deps_missing="$xdt_feature_deps_missing, yaml-0.1 >= 0.1.7" - fi - fi - else -@@ -22546,9 +22546,9 @@ fi - - - -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for yaml-0.1 >= 0.2.5" >&5 --printf %s "checking for yaml-0.1 >= 0.2.5... " >&6; } -- if $PKG_CONFIG "--atleast-version=0.2.5" "yaml-0.1" >/dev/null 2>&1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for yaml-0.1 >= 0.1.7" >&5 -+printf %s "checking for yaml-0.1 >= 0.1.7... " >&6; } -+ if $PKG_CONFIG "--atleast-version=0.1.7" "yaml-0.1" >/dev/null 2>&1; then - LIBYAML_VERSION=`$PKG_CONFIG --modversion "yaml-0.1"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBYAML_VERSION" >&5 - printf "%s\n" "$LIBYAML_VERSION" >&6; } -@@ -22565,7 +22565,7 @@ printf %s "checking LIBYAML_LIBS... " >& - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBYAML_LIBS" >&5 - printf "%s\n" "$LIBYAML_LIBS" >&6; } - -- LIBYAML_REQUIRED_VERSION=0.2.5 -+ LIBYAML_REQUIRED_VERSION=0.1.7 - - - -@@ -22594,7 +22594,7 @@ printf "%s\n" "found, but $xdt_cv_versio - - echo "*** The required package yaml-0.1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade yaml-0.1 to atleast version 0.2.5, or adjust" -+ echo "*** Please upgrade yaml-0.1 to atleast version 0.1.7, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -22606,7 +22606,7 @@ printf "%s\n" "not found" >&6; } - - - echo "*** The required package yaml-0.1 was not found on your system." -- echo "*** Please install yaml-0.1 (atleast version 0.2.5) or adjust" -+ echo "*** Please install yaml-0.1 (atleast version 0.1.7) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." +diff -rup a/meson.build b/meson.build +--- a/meson.build 2025-02-17 09:57:17.000000000 +0100 ++++ b/meson.build 2025-10-22 13:15:38.919268643 +0200 +@@ -21,7 +21,7 @@ dependency_versions = { + 'libnotify': '>= 0.4.0', + 'libx11': '>= 1.6.7', + 'libxfce4windowing': '>= 4.19.8', +- 'libyaml': '>= 0.2.5', ++ 'libyaml': '>= 0.1.7', + 'xfce4': '>= 4.18.0', + 'xfconf': '>= 4.19.3', + 'gtk-layer-shell': '>= 0.7.0',
