diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2015-06-03 22:41:29 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-06-09 23:02:02 +0200 |
| commit | 390ef4ebb441c263f16572e458c71bde35d01c58 (patch) | |
| tree | 5351c9bdadc80ba73545f34e1c560c3da4e909df /package/matchbox/0001-defaulttheme.patch | |
| parent | 02994456527ffcae435f2358afbe8c349f95cf69 (diff) | |
| download | buildroot-390ef4ebb441c263f16572e458c71bde35d01c58.tar.gz buildroot-390ef4ebb441c263f16572e458c71bde35d01c58.zip | |
package/matchbox: get rid of intermediate non-package matchbox
Currently, the matchbox entry in the menu is a non-package entry, that
forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the existing
matchbox-wm to simply matchbox, so we have a real package from the
onset.
Since we're re-using the previous option for the WM package, there is no
need for an entry in the legacy menu.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/matchbox/0001-defaulttheme.patch')
| -rw-r--r-- | package/matchbox/0001-defaulttheme.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/matchbox/0001-defaulttheme.patch b/package/matchbox/0001-defaulttheme.patch new file mode 100644 index 0000000000..b4da66409c --- /dev/null +++ b/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 */ |
