summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-05-12 17:14:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-14 14:15:11 +0100
commitcf8ed74154fa8300ddfd67772f10b97f4b840255 (patch)
tree46710a7914b99ce98ccd45c7a9ae976d746ae406 /meta/recipes-graphics
parente324a20ea15036bab78131761d172d45fe7e98f4 (diff)
downloadpoky-cf8ed74154fa8300ddfd67772f10b97f4b840255.tar.gz
matchbox-wm: Replace -fcommon with fix
(From OE-Core rev: d69a05533048d0e50f5ee47b2c35675bc615728c) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch41
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb3
2 files changed, 42 insertions, 2 deletions
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
new file mode 100644
index 0000000000..541b5c9c84
--- /dev/null
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch
@@ -0,0 +1,41 @@
1From 8a8f8446e803cad04d7bbceaab78ee45d9778c3c Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Tue, 12 May 2020 09:44:05 +0300
4Subject: Fix build with gcc 10
5
6Upstream-Status: Pending
7Signed-off-by: Adrian Bunk <bunk@stusta.de>
8---
9 src/mbtheme.h | 2 +-
10 src/structs.h | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/mbtheme.h b/src/mbtheme.h
14index aa9a7c5..ad03bde 100644
15--- a/src/mbtheme.h
16+++ b/src/mbtheme.h
17@@ -46,7 +46,7 @@ typedef struct _mb_theme_param
18
19 } MBThemeParam;
20
21-enum {
22+typedef enum {
23 LAYER_GRADIENT_HORIZ = 1,
24 LAYER_GRADIENT_VERT,
25 LAYER_LABEL,
26diff --git a/src/structs.h b/src/structs.h
27index 24985e7..8f53e72 100644
28--- a/src/structs.h
29+++ b/src/structs.h
30@@ -148,7 +148,7 @@
31
32 /* Atoms, if you change these check ewmh_init() first */
33
34-enum {
35+typedef enum {
36 WM_STATE = 0,
37 WM_CHANGE_STATE,
38 WM_PROTOCOLS,
39--
402.17.1
41
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
index 675ee40fa4..a08eb252ce 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
@@ -13,6 +13,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
13# SRCREV tagged 1.2.2 13# SRCREV tagged 1.2.2
14SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970" 14SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970"
15SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ 15SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
16 file://0001-Fix-build-with-gcc-10.patch \
16 file://kbdconfig" 17 file://kbdconfig"
17 18
18S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
@@ -21,8 +22,6 @@ inherit autotools pkgconfig features_check
21# depends on virtual/libx11 22# depends on virtual/libx11
22REQUIRED_DISTRO_FEATURES = "x11" 23REQUIRED_DISTRO_FEATURES = "x11"
23 24
24CFLAGS += "-fcommon"
25
26FILES_${PN} = "${bindir}/* \ 25FILES_${PN} = "${bindir}/* \
27 ${datadir}/matchbox \ 26 ${datadir}/matchbox \
28 ${sysconfdir}/matchbox \ 27 ${sysconfdir}/matchbox \