[Mod] First commit

package/matchbox/0001-defaulttheme.patch

@@ -0,0 +1,47 @@
+[PATCH] fix mbtheme build issue when png support is disabled
+
+DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading
+to compile errors in mbtheme.c:
+
+mbtheme.c: In function 'show_parse_error':
+mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in
+mbtheme.c: In function 'mbtheme_init':
+mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function)
+
+Fix it by unconditionally defining them as the values used are the same
+in png / !png cases anyway.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/structs.h |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+Index: matchbox-window-manager-1.2/src/structs.h
+===================================================================
+--- matchbox-window-manager-1.2.orig/src/structs.h
++++ matchbox-window-manager-1.2/src/structs.h
+@@ -81,8 +81,6 @@
+ 
+ #define GENERIC_ICON        PKGDATADIR "/mbnoapp.xpm"
+ 
+-#ifdef MB_HAVE_PNG
+-
+ #define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+ 
+ #define DEFAULTTHEME       DATADIR "/themes/Default/matchbox/theme.xml"
+@@ -91,13 +89,6 @@
+ 
+ #define DEFAULTTHEMENAME  "Default"
+ 
+-#else
+-
+-#define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+-#define DEFAULT_THEME_NAME  "Default"
+-
+-#endif
+-
+ #define CONFDEFAULTS       PKGDATADIR "/defaults"
+ 
+ /* Simple Macros  */

package/matchbox/0002-src-Fix-build-with-gcc-10.patch

@@ -0,0 +1,47 @@
+From 844f61069896fe3f549ab425d731c061028f697c Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@stusta.de>
+Date: Tue, 12 May 2020 09:44:05 +0300
+Subject: src: Fix build with gcc 10
+
+gcc 10 enables -fno-common by default which fails without these typedefs
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+[Retrieved from:
+http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager/commit/?id=844f61069896fe3f549ab425d731c061028f697c]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ 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,
+-- 
+cgit v1.2.2-1-g5e49
+

package/matchbox/Config.in

@@ -0,0 +1,35 @@
+menuconfig BR2_PACKAGE_MATCHBOX
+	bool "matchbox"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_MATCHBOX_LIB
+	help
+	  Matchbox is an Open Source base environment for the X Window
+	  System running on non-desktop embedded platforms such as
+	  handhelds, set-top boxes, kiosks and anything else for which
+	  screen space, input mechanisms or system resources are
+	  limited.
+
+	  https://www.yoctoproject.org/tools-resources/projects/matchbox
+
+if BR2_PACKAGE_MATCHBOX
+
+config BR2_PACKAGE_MATCHBOX_SM
+	bool "session manager"
+	select BR2_PACKAGE_XLIB_LIBSM
+	help
+	  Enable support for the Session Manager.
+
+comment "matchbox utilities"
+
+source "package/matchbox-common/Config.in"
+source "package/matchbox-desktop/Config.in"
+source "package/matchbox-fakekey/Config.in"
+source "package/matchbox-keyboard/Config.in"
+source "package/matchbox-lib/Config.in"
+source "package/matchbox-panel/Config.in"
+source "package/matchbox-startup-monitor/Config.in"
+
+endif

package/matchbox/matchbox.hash

@@ -0,0 +1,6 @@
+# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2.md5
+md5  3e158dcf57823b55c926d95b245500fb  matchbox-window-manager-1.2.tar.bz2
+
+# Locally computed
+sha256  81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff  matchbox-window-manager-1.2.tar.bz2
+sha256  231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING

package/matchbox/matchbox.mk

@@ -0,0 +1,46 @@
+################################################################################
+#
+# matchbox
+#
+################################################################################
+
+MATCHBOX_VERSION = 1.2
+MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2
+MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION)
+MATCHBOX_LICENSE = GPL-2.0+
+MATCHBOX_LICENSE_FILES = COPYING
+
+MATCHBOX_DEPENDENCIES = expat matchbox-lib
+MATCHBOX_CONF_OPTS = \
+	--enable-expat \
+	--disable-gconf \
+	--disable-composite \
+	--disable-standalone \
+	--disable-standalone-xft
+
+# Workaround bug in configure script
+MATCHBOX_CONF_ENV = expat=yes
+
+ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
+MATCHBOX_CONF_OPTS += --enable-startup-notification
+MATCHBOX_DEPENDENCIES += startup-notification
+else
+MATCHBOX_CONF_OPTS += --disable-startup-notification
+endif
+
+ifeq ($(BR2_PACKAGE_MATCHBOX_SM),y)
+MATCHBOX_CONF_OPTS += --enable-session
+MATCHBOX_DEPENDENCIES += xlib_libSM
+else
+MATCHBOX_CONF_OPTS += --disable-session
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+MATCHBOX_DEPENDENCIES += xlib_libXcursor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+MATCHBOX_DEPENDENCIES += xlib_libXfixes
+endif
+
+$(eval $(autotools-package))