diff mbox series

[meta-gnome,3/3] libwnck3: upgrade 43.2 -> 43.3

Message ID 20260325102620.1901081-3-peng.zhang1.cn@windriver.com
State Under Review
Headers show
Series [meta-gnome,1/3] metacity: upgrade 3.56.0 -> 3.58.1 | expand

Commit Message

Zhang Peng March 25, 2026, 10:26 a.m. UTC 
From: Zhang Peng <peng.zhang1.cn@windriver.com>

Version 43.3
============
  * Fix clang warnings. (!66, !68)
  * Fix regression with class group and application names. (#166)

Drop ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch,
already included in 43.3.

Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
---
 ...40d59c32d7ebeb94d242436e3144cefc174a.patch | 40 -------------------
 .../{libwnck3_43.2.bb => libwnck3_43.3.bb}    |  5 +--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
 rename meta-gnome/recipes-gnome/libwnck/{libwnck3_43.2.bb => libwnck3_43.3.bb} (75%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch b/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
deleted file mode 100644
index 2d526e7aba..0000000000
--- a/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
-From ef0e40d59c32d7ebeb94d242436e3144cefc174a Mon Sep 17 00:00:00 2001
-From: correctmost <136447-correctmost@users.noreply.gitlab.gnome.org>
-Date: Thu, 20 Mar 2025 03:03:44 -0400
-Subject: [PATCH] build: fix -Wheader-guard warnings reported by clang
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libwnck/-/commit/ef0e40d59c32d7ebeb94d242436e3144cefc174a]
----
- libwnck/pager-accessible-factory.h     | 2 +-
- libwnck/workspace-accessible-factory.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libwnck/pager-accessible-factory.h b/libwnck/pager-accessible-factory.h
-index 8e2fe30c..25220fc2 100644
---- a/libwnck/pager-accessible-factory.h
-+++ b/libwnck/pager-accessible-factory.h
-@@ -17,7 +17,7 @@
-  */
- 
- #ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
--#define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__
-+#define __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
- 
- #include <atk/atk.h>
- 
-diff --git a/libwnck/workspace-accessible-factory.h b/libwnck/workspace-accessible-factory.h
-index d2d4a84a..335b465b 100644
---- a/libwnck/workspace-accessible-factory.h
-+++ b/libwnck/workspace-accessible-factory.h
-@@ -17,7 +17,7 @@
-  */
- 
- #ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
--#define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
-+#define __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
- 
- #include <atk/atk.h>
- 
--- 
-GitLab
-
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb
similarity index 75%
rename from meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb
rename to meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb
index 13923a3e17..3a49c0e2f3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.3.bb
@@ -19,8 +19,7 @@  inherit gnomebase gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI += "file://ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch;patch=1 \
-            file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1"
-SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5"
+SRC_URI += "file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1"
+SRC_URI[archive.sha256sum] = "6af8ac41a8f067ade1d3caaed254a83423b5f61ad3f7a460fcacbac2e192bdf7"
 
 REQUIRED_DISTRO_FEATURES = "x11"