diff options
Diffstat (limited to 'package/matchbox')
| -rw-r--r-- | package/matchbox/Config.in | 1 | ||||
| -rw-r--r-- | package/matchbox/matchbox-desktop/matchbox-desktop.mk | 2 | ||||
| -rw-r--r-- | package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch | 47 |
3 files changed, 49 insertions, 1 deletions
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index e4b6149d7..d89a1762e 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_MATCHBOX_PANEL config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop" depends on BR2_PACKAGE_MATCHBOX + select BR2_PACKAGE_ZLIB help A PDA style application launcher or 'item browser'. diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk index f8e854c95..13ea73074 100644 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk @@ -10,7 +10,7 @@ MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR) MATCHBOX_DESKTOP_LICENSE = GPLv2+ MATCHBOX_DESKTOP_LICENSE_FILES = COPYING -MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib +MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib MATCHBOX_DESKTOP_CONF_OPT = --enable-expat # The bundled configure script does not properly replace LIBADD_DL, so diff --git a/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch b/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch new file mode 100644 index 000000000..b4da66409 --- /dev/null +++ b/package/matchbox/matchbox-wm/matchbox-wm-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 */ |