Drop a patch merged in the upstream repo.
License changes are due to the addition of SPDX license headers.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
.../0001-Fix-build-with-gcc-10.patch | 41 -------------------
...chbox-wm_1.2.2.bb => matchbox-wm_1.2.3.bb} | 10 ++---
2 files changed, 4 insertions(+), 47 deletions(-)
delete mode 100644
meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch
rename meta/recipes-graphics/matchbox-wm/{matchbox-wm_1.2.2.bb =>
matchbox-wm_1.2.3.bb} (74%)
diff --git
a/meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch
b/meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch
deleted file mode 100644
index 541b5c9c841..00000000000
---
a/meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8a8f8446e803cad04d7bbceaab78ee45d9778c3c Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <b...@stusta.de>
-Date: Tue, 12 May 2020 09:44:05 +0300
-Subject: Fix build with gcc 10
-
-Upstream-Status: Pending
-Signed-off-by: Adrian Bunk <b...@stusta.de>
----
- src/mbtheme.h | 2 +-
- src/structs.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mbtheme.h b/src/mbtheme.h
-index aa9a7c5..ad03bde 100644
---- a/src/mbtheme.h
-+++ b/src/mbtheme.h
-@@ -46,7 +46,7 @@ typedef struct _mb_theme_param
-
- } MBThemeParam;
-
--enum {
-+typedef enum {
- LAYER_GRADIENT_HORIZ = 1,
- LAYER_GRADIENT_VERT,
- LAYER_LABEL,
-diff --git a/src/structs.h b/src/structs.h
-index 24985e7..8f53e72 100644
---- a/src/structs.h
-+++ b/src/structs.h
-@@ -148,7 +148,7 @@
-
- /* Atoms, if you change these check ewmh_init() first */
-
--enum {
-+typedef enum {
- WM_STATE = 0,
- WM_CHANGE_STATE,
- WM_PROTOCOLS,
---
-2.17.1
-
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb
similarity index 74%
rename from meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
rename to meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb
index 81704beac46..8e9de0914e8 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb
@@ -3,17 +3,15 @@ HOMEPAGE = "http://matchbox-project.org";
BUGTRACKER = "http://bugzilla.yoctoproject.org/";
LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM =
"file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \
-
file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \
-
file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab"
+LIC_FILES_CHKSUM =
"file://src/wm.h;endline=21;md5=ce20617ac10f26045cc57b8d977ab552 \
+
file://src/main.c;endline=21;md5=508f280276140250ce483e0a44f7a9ec \
+
file://src/wm.c;endline=21;md5=f54584fb0d48cfc2e6876e0f0e272e6c"
SECTION = "x11/wm"
DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification
expat gconf libxcursor libxfixes"
-# SRCREV tagged 1.2.2
-SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970"
+SRCREV = "ce8c1053270d960a7235ab5c3435f707541810a4"
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master \
- file://0001-Fix-build-with-gcc-10.patch \
file://kbdconfig"
S = "${WORKDIR}/git"
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178657):
https://lists.openembedded.org/g/openembedded-core/message/178657
Mute This Topic: https://lists.openembedded.org/mt/97638882/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
