From e4d74311964730881a6b608a009e2d6955a7e38142ab23f01734da76a10db321 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 15 Aug 2025 11:56:28 +0200
Subject: [PATCH] Update to version 4.20.5

* wayland: panel: Ensure panel window is shown at least once
* panel: Don't show panel window too early
* panel: Restrict X-XFCE-Unique=SCREEN to X11
* Fix string comparison when searching for plugin dirs
* wayland: Support multiple workspace groups where it makes sense
* tasklist: Deactivate context menu when its button is destroyed
* x11: Let GtkSocket expand if possible
* libxfce4panel: Restore possibility to oversize icons
* wayland: autohide: Try to trigger size_allocate() more reliably
* panel: Show window when new output is connected
* Translation Updates
---
 xfce4-panel-4.20.4.tar.bz2 |  3 ---
 xfce4-panel-4.20.5.tar.bz2 |  3 +++
 xfce4-panel.changes        | 16 ++++++++++++++++
 xfce4-panel.spec           | 31 +++++++++----------------------
 4 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 xfce4-panel-4.20.4.tar.bz2
 create mode 100644 xfce4-panel-4.20.5.tar.bz2

diff --git a/xfce4-panel-4.20.4.tar.bz2 b/xfce4-panel-4.20.4.tar.bz2
deleted file mode 100644
index ed13a06..0000000
--- a/xfce4-panel-4.20.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:695b23af490719e734c8659394821b43cc94d3bee69994bafdc42ef40daa0d2c
-size 2287183
diff --git a/xfce4-panel-4.20.5.tar.bz2 b/xfce4-panel-4.20.5.tar.bz2
new file mode 100644
index 0000000..7ac9a66
--- /dev/null
+++ b/xfce4-panel-4.20.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f91850c9c467680c8081d561f1a3fd83355c07db07be9a96da1764f8c842b2b
+size 2293754
diff --git a/xfce4-panel.changes b/xfce4-panel.changes
index da95c1b..40130cb 100644
--- a/xfce4-panel.changes
+++ b/xfce4-panel.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Aug 14 13:23:20 UTC 2025 - Manfred Hollstein <manfred.h@gmx.net>
+
+- Update to version 4.20.5
+  * wayland: panel: Ensure panel window is shown at least once
+  * panel: Don't show panel window too early
+  * panel: Restrict X-XFCE-Unique=SCREEN to X11
+  * Fix string comparison when searching for plugin dirs
+  * wayland: Support multiple workspace groups where it makes sense
+  * tasklist: Deactivate context menu when its button is destroyed
+  * x11: Let GtkSocket expand if possible
+  * libxfce4panel: Restore possibility to oversize icons
+  * wayland: autohide: Try to trigger size_allocate() more reliably
+  * panel: Show window when new output is connected
+  * Translation Updates
+
 -------------------------------------------------------------------
 Sun Mar 23 11:51:50 UTC 2025 - Manfred Hollstein <manfred.h@gmx.net>
 
diff --git a/xfce4-panel.spec b/xfce4-panel.spec
index fee6591..4151bfd 100644
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-panel
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,10 @@
 #
 
 
-%bcond_with git
 %define libname libxfce4panel-2_0-4
 
 Name:           xfce4-panel
-Version:        4.20.4
+Version:        4.20.5
 Release:        0
 Summary:        Panel for the Xfce Desktop Environment
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -35,6 +34,7 @@ BuildRequires:  ed
 BuildRequires:  fdupes
 BuildRequires:  gettext >= 0.19.8
 BuildRequires:  gtk-doc >= 1.9
+BuildRequires:  meson >= 0.56.0
 BuildRequires:  perl
 BuildRequires:  update-desktop-files
 
@@ -142,23 +142,14 @@ A desktop file and application launcher is provided.
 %autosetup
 
 %build
-%if %{with git}
-NOCONFIGURE=1 ./autogen.sh
-%configure \
-    --enable-maintainer-mode \
-    --with-helper-path-prefix=%{_libexecdir} \
-    --enable-vala=yes \
-    --disable-static
-%else
-%configure \
-    --with-helper-path-prefix=%{_libexecdir} \
-    --enable-vala=yes \
-    --disable-static
-%endif
-%make_build
+%meson \
+    -Dhelper-path-prefix="%{_libexecdir}"	\
+    -Dgtk-doc=true				\
+    -Dvala=enabled
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 install -m0755 %{SOURCE2} %{buildroot}/%{_bindir}/%{name}-restore-defaults
 
@@ -185,11 +176,7 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files
-%if %{with git}
 %doc AUTHORS NEWS README.md
-%else
-%doc AUTHORS ChangeLog NEWS README.md
-%endif
 %license COPYING COPYING.LIB
 %{_bindir}/xfce4-panel
 %{_bindir}/xfce4-popup-applicationsmenu
-- 
2.51.1