diff options
Diffstat (limited to 'meta/recipes-graphics/matchbox-wm')
| -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 (renamed from meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb) | 16 |
2 files changed, 49 insertions, 8 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 @@ +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_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb index 422d255951..81704beac4 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Matchbox lightweight window manager" HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.yoctoproject.org/" -LICENSE = "GPLv2+" +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" @@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa SECTION = "x11/wm" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" -SRCREV = "29544f0e61cc281fc60061443a537271e1081b78" -PV = "1.2+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ +# SRCREV tagged 1.2.2 +SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970" +SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master \ + file://0001-Fix-build-with-gcc-10.patch \ file://kbdconfig" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -FILES_${PN} = "${bindir}/* \ +FILES:${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ ${datadir}/themes/blondie/matchbox \ @@ -35,6 +35,6 @@ EXTRA_OECONF = " --enable-startup-notification \ --with-expat-lib=${STAGING_LIBDIR} \ --with-expat-includes=${STAGING_INCDIR}" -do_install_prepend() { +do_install:prepend() { install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig } |