Merge remote-tracking branch 'origin/rawhide' into epel8

.gitignore

@@ -1 +1,29 @@
-/xfce4-settings-*.tar.bz2
+xfce4-settings-4.6.5.tar.bz2
+/xfce4-settings-4.7.7.tar.bz2
+/xfce4-settings-4.8.0.tar.bz2
+/xfce4-settings-4.8.1.tar.bz2
+/xfce4-settings-4.8.2.tar.bz2
+/xfce4-settings-4.8.3.tar.bz2
+/xfce4-settings-4.9.4.tar.bz2
+/xfce4-settings-4.9.5.tar.bz2
+/xfce4-settings-4.10.0.tar.bz2
+/xfce4-settings-4.10.1.tar.bz2
+/xfce4-settings-4.12.0.tar.bz2
+/xfce4-settings-4.12.1.tar.bz2
+/xfce4-settings-4.12.2.tar.bz2
+/xfce4-settings-4.12.3.tar.bz2
+/xfce4-settings-4.12.4.tar.bz2
+/xfce4-settings-4.13.4.tar.bz2
+/xfce4-settings-4.13.5.tar.bz2
+/xfce4-settings-4.13.6.tar.bz2
+/xfce4-settings-4.13.7.tar.bz2
+/xfce4-settings-4.13.8.tar.bz2
+/xfce4-settings-4.14.0.tar.bz2
+/xfce4-settings-4.14.1.tar.bz2
+/xfce4-settings-4.14.2.tar.bz2
+/xfce4-settings-4.14.3.tar.bz2
+/xfce4-settings-4.16.0.tar.bz2
+/xfce4-settings-4.16.1.tar.bz2
+/xfce4-settings-4.16.2.tar.bz2
+/xfce4-settings-4.16.3.tar.bz2
+/xfce4-settings-4.16.5.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (xfce4-settings-4.20.5.tar.bz2) = 99ec7f585029f10d90d462b7dc57376786952b6c92ff80a174195cbc4b89989191c8363fd4f359a99eb5bfc2e10dc411961ab331f1f8c6911c6b3e32d7ab448e
+SHA512 (xfce4-settings-4.16.5.tar.bz2) = 1334875d8ae02a63312a3973f310138640b1a1ee80ad6665ee0f45d544092ef556b89259da613c53ab51219c9ac97fee860292133716da136792cdfd3d646e4e

xfce4-settings-4.14-fedora.patch

@@ -0,0 +1,25 @@
+--- xfsettingsd/xsettings.xml.orig	2015-02-23 19:33:11.000000000 -0600
++++ xfsettingsd/xsettings.xml	2015-02-28 18:30:51.863719465 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Adwaita"/>
++    <property name="IconThemeName" type="string" value="Adwaita"/>
+     <property name="DoubleClickTime" type="int" value="400"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>

xfce4-settings-4.20-fedora.patch

@@ -1,14 +0,0 @@
---- xfsettingsd/xsettings.xml.orig	2025-02-15 11:18:57.698932502 -0600
-+++ xfsettingsd/xsettings.xml	2025-02-15 11:21:36.088560532 -0600
-@@ -19,9 +19,9 @@
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="int" value="96"/>
--    <property name="Antialias" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-     <property name="Hinting" type="int" value="-1"/>
--    <property name="HintStyle" type="string" value="hintnone"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-     <property name="RGBA" type="string" value="none"/>
-   </property>
-   <property name="Gtk" type="empty">

xfce4-settings.spec

@@ -1,38 +1,34 @@
-%global xfceversion 4.20
+%global xfceversion 4.16
 
 Name:           xfce4-settings
-Version:        4.20.5
+Version:        4.16.5
 Release:        %autorelease
 Summary:        Settings Manager for Xfce
 
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://www.xfce.org/
-#VCS git:git://git.xfce.org/xfce/xfce4-settings
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # Use Fedora theme and font settings
-Patch10:        xfce4-settings-%{xfceversion}-fedora.patch
+Patch10:        xfce4-settings-4.14-fedora.patch
 
-BuildRequires:  colord-devel
-BuildRequires:  desktop-file-utils >= 0.7
-BuildRequires:  exo-devel >= 0.5.0
-BuildRequires:  garcon-devel >= %{xfceversion}
+BuildRequires: make
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
-BuildRequires:  gtk-layer-shell-devel
 BuildRequires:  intltool
-BuildRequires:  libXrandr-devel
-BuildRequires:  libcanberra-devel
-BuildRequires:  libnotify-devel
+BuildRequires:  exo-devel >= 0.5.0
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
 BuildRequires:  libxfce4util-devel >= %{xfceversion}
-BuildRequires:  libxklavier-devel
-BuildRequires:  make
 BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  desktop-file-utils >= 0.7
+BuildRequires:  libnotify-devel
+BuildRequires:  colord-devel
+BuildRequires:  libcanberra-devel
+BuildRequires:  libxklavier-devel
 %ifnarch s390 s390x
 BuildRequires:  xorg-x11-drv-libinput-devel
 %endif
-
+BuildRequires:  libXrandr-devel
+BuildRequires:  garcon-devel >= 0.1.10
 Requires:       xfconf
 %if 0%{?rhel} <= 7
 Requires:       gnome-icon-theme
@@ -42,18 +38,17 @@ Requires:       gnome-icon-theme
 This package includes the settings manager applications for the Xfce desktop. 
 
 %prep
-%autosetup -p0
+%setup -q
+%patch10
+
 
 %build
-%configure --enable-sound-settings --enable-xorg-libinput
+%configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode --enable-xorg-libinput
 %make_build
 
 %install
 %make_install
 
-# Remove invalid locale directory to silence rpmlint
-rm -rf %{buildroot}%{_datadir}/locale/hye
-
 for file in %{buildroot}%{_datadir}/applications/*.desktop ; do
     desktop-file-install \
         --add-category="X-XFCE" \
@@ -63,11 +58,12 @@ for file in %{buildroot}%{_datadir}/applications/*.desktop ; do
         $file
 done
 
+
 %find_lang %{name}
 
 %files -f %{name}.lang
 %license COPYING
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog NEWS TODO
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfsettingsd.desktop
 %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-settings-manager.menu
@@ -80,7 +76,8 @@ done
 %{_bindir}/xfce4-find-cursor
 %{_datadir}/applications/xfce*.desktop
 %{_libdir}/xfce4
-%{_libdir}/gtk-3.0/modules/libxfsettingsd-gtk-settings-sync.so
+%{_libdir}/xfce4/xfce4-compose-mail
+%{_libdir}/xfce4/settings
 %{_datadir}/icons/hicolor/*/*/*xfce*
 %{_datadir}/xfce4/helpers/*.desktop