From da508968af436edb875078840e977699f4ddf3fe Mon Sep 17 00:00:00 2001
From: Zhang Peng <peng.zhang1.cn@windriver.com>
Date: Tue, 24 Mar 2026 20:59:14 +0800
Subject: [PATCH] garcon: upgrade 4.20.0 -> 4.21.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

4.21.0 (2025-03-23)
======
- build: Automate copyright year management
- build: Define xfce4 min version >= 4.18
- Replace deprecated exo with libxfce4ui 4.21.0
- meson-build: Add tests option
- meson-build: Use SPDX license expression
- meson-build: Update debug/optimization flag management
- autotools-build: Fix EXTRA_DIST redefinition
- Add meson build
- Set up GNU symbol visibility
- garcon: Remove include guard from private header
- garcon: Don't install garcon-marshal.h
- Translation Updates:
  Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Asturian,
  Basque, Belarusian, Bengali, Bulgarian, Catalan, Chinese (China),
  Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish,
  Dutch, Eastern Armenian, English (Australia), English (United
  Kingdom), Esperanto, Estonian, Finnish, French, Galician, Georgian,
  German, Greek, Hebrew, Hindi, Hungarian, Icelandic, Indonesian,
  Interlingue, Italian, Japanese, Kabyle, Kazakh, Korean, Lithuanian,
  Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500),
  Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian,
  Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian,
  Uyghur, Welsh

Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../garcon/{garcon_4.20.0.bb => garcon_4.21.0.bb}         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
 rename meta-xfce/recipes-xfce/garcon/{garcon_4.20.0.bb => garcon_4.21.0.bb} (68%)

diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb
similarity index 68%
rename from meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb
rename to meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb
index 5d7282ecbf..06ad0b9fbc 100644
--- a/meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb
@@ -5,6 +5,8 @@ LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b"
 DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native"
 
+XFCE_COMPRESS_TYPE = "xz"
+
 inherit xfce gtk-doc gobject-introspection features_check
 
 # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
@@ -12,12 +14,16 @@ inherit xfce gtk-doc gobject-introspection features_check
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch"
-SRC_URI[sha256sum] = "7fb8517c12309ca4ddf8b42c34bc0c315e38ea077b5442bfcc4509415feada8f"
+SRC_URI[sha256sum] = "3acc3f6b81059199f4e6646da7b6ca39edf84ea90dd3ff87088ffca6aa108269"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_compile:prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs"
+    # g-ir-scanner needs garcon/garcon-config.h but it's generated in ${B}/garcon/
+    mkdir -p ${B}/garcon/garcon ${B}/garcon-gtk/garcon
+    ln -sf ${B}/garcon/garcon-config.h ${B}/garcon/garcon/
+    ln -sf ${B}/garcon/garcon-config.h ${B}/garcon-gtk/garcon/
 }
 
 FILES:${PN} += "${datadir}/desktop-directories"