From b1b2dce41ba1f62b24c8074fb5c68561dc765180 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Thu, 19 Dec 2024 18:52:24 +0800
Subject: xfdesktop: 4.18.1 -> 4.20.0

Upgrade xfdesktop from 4.18.1 to 4.20.0:

* add dependency libxfce4windowing
* set variables from glib-2.0.pc in EXTRA_OECONF since paths have been
  removed from the .pc file in oe-core

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb     | 28 -----------------
 .../recipes-xfce/xfdesktop/xfdesktop_4.20.0.bb     | 35 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 28 deletions(-)
 delete mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb
 create mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.0.bb

(limited to 'meta-xfce')

diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb
deleted file mode 100644
index f4d5fef8e..000000000
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Xfce4 Desktop Manager"
-SECTION = "x11/base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = " \
-    cairo \
-    exo \
-    garcon \
-    glib-2.0 \
-    gtk+3 \
-    intltool \
-    libwnck3 \
-    libxfce4ui \
-    libxfce4util \
-    thunar \
-    xfconf \
-"
-
-inherit xfce features_check
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[sha256sum] = "ef9268190c25877e22a9ff5aa31cc8ede120239cb0dfca080c174e7eed4ff756"
-
-PACKAGECONFIG ??= "notify"
-PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
-
-FILES:${PN} += "${datadir}/backgrounds"
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.0.bb
new file mode 100644
index 000000000..d3360b293
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.0.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Xfce4 Desktop Manager"
+SECTION = "x11/base"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = " \
+    cairo \
+    exo \
+    garcon \
+    glib-2.0 \
+    gtk+3 \
+    intltool \
+    libwnck3 \
+    libxfce4ui \
+    libxfce4util \
+    libxfce4windowing \
+    thunar \
+    xfconf \
+"
+
+inherit xfce features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[sha256sum] = "227041ba80c7f3eb9c99dec817f1132b35d8aec7a4335703f61ba1735cd65632"
+
+PACKAGECONFIG ??= "notify"
+PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
+
+EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \
+                GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources \
+                GLIB_GENMARSHAL=${STAGING_BINDIR_NATIVE}/glib-genmarshal \
+                GLIB_MKENUMS=${STAGING_BINDIR_NATIVE}/glib-mkenums \
+                "
+
+FILES:${PN} += "${datadir}/backgrounds"
-- 
cgit v1.2.3-54-g00ecf