diff options
author | Adrian Bunk <bunk@stusta.de> | 2020-05-12 17:14:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-14 14:13:50 +0100 |
commit | d69a05533048d0e50f5ee47b2c35675bc615728c (patch) | |
tree | f85eae6a31cafc0f6cc976ddb22b0f06572b69b6 /meta | |
parent | 97984f171b562f4ccaef527e6766b0e94697cf43 (diff) | |
download | openembedded-core-contrib-d69a05533048d0e50f5ee47b2c35675bc615728c.tar.gz |
matchbox-wm: Replace -fcommon with fix
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch | 41 | ||||
-rw-r--r-- | meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb | 3 |
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 00000000000..541b5c9c841 --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/0001-Fix-build-with-gcc-10.patch @@ -0,0 +1,41 @@ +From 8a8f8446e803cad04d7bbceaab78ee45d9778c3c Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@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 <bunk@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.2.bb index 675ee40fa41..a08eb252ce0 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 # SRCREV tagged 1.2.2 SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970" SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ + file://0001-Fix-build-with-gcc-10.patch \ file://kbdconfig" S = "${WORKDIR}/git" @@ -21,8 +22,6 @@ inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -CFLAGS += "-fcommon" - FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ |