From: Yann E. MORIN Date: Wed, 3 Jun 2015 20:41:29 +0000 (+0200) Subject: package/matchbox: get rid of intermediate non-package matchbox X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=390ef4ebb441c263f16572e458c71bde35d01c58;p=buildroot.git 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" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- 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 +--- + 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 */ diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 891ac9583b..7d06bb29aa 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB - select BR2_PACKAGE_MATCHBOX_WM help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as @@ -20,7 +19,6 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" -source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" diff --git a/package/matchbox/matchbox-wm/0001-defaulttheme.patch b/package/matchbox/matchbox-wm/0001-defaulttheme.patch deleted file mode 100644 index b4da66409c..0000000000 --- a/package/matchbox/matchbox-wm/0001-defaulttheme.patch +++ /dev/null @@ -1,47 +0,0 @@ -[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 ---- - 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 */ diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in deleted file mode 100644 index 6ad5dfcbc2..0000000000 --- a/package/matchbox/matchbox-wm/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_WM - bool - select BR2_PACKAGE_MATCHBOX_LIB diff --git a/package/matchbox/matchbox-wm/matchbox-wm.hash b/package/matchbox/matchbox-wm/matchbox-wm.hash deleted file mode 100644 index f00ed4e4f3..0000000000 --- a/package/matchbox/matchbox-wm/matchbox-wm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk deleted file mode 100644 index da9efd752f..0000000000 --- a/package/matchbox/matchbox-wm/matchbox-wm.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# matchbox-wm -# -################################################################################ - -MATCHBOX_WM_VERSION = 1.2 -MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2 -MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION) -MATCHBOX_WM_LICENSE = GPLv2+ -MATCHBOX_WM_LICENSE_FILES = COPYING - -MATCHBOX_WM_DEPENDENCIES = matchbox-lib -MATCHBOX_WM_CONF_OPTS = --enable-expat - -# Workaround bug in configure script -MATCHBOX_WM_CONF_ENV = expat=yes - -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) -MATCHBOX_WM_CONF_OPTS += --enable-composite -MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite -MATCHBOX_WM_DEPENDENCIES += xlib_libXpm -endif -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -MATCHBOX_WM_DEPENDENCIES += xlib_libXft -endif - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -MATCHBOX_WM_CONF_OPTS += --enable-startup-notification -MATCHBOX_WM_DEPENDENCIES += startup-notification -else -MATCHBOX_WM_CONF_OPTS += --disable-startup-notification -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox.hash b/package/matchbox/matchbox.hash new file mode 100644 index 0000000000..f00ed4e4f3 --- /dev/null +++ b/package/matchbox/matchbox.hash @@ -0,0 +1,2 @@ +# 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 diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index ae989b3941..100a633363 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -1 +1,41 @@ +################################################################################ +# +# 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 = GPLv2+ +MATCHBOX_LICENSE_FILES = COPYING + +MATCHBOX_DEPENDENCIES = matchbox-lib +MATCHBOX_CONF_OPTS = --enable-expat + +# Workaround bug in configure script +MATCHBOX_CONF_ENV = expat=yes + +ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +MATCHBOX_CONF_OPTS += --enable-composite +MATCHBOX_DEPENDENCIES += xlib_libXcomposite +MATCHBOX_DEPENDENCIES += xlib_libXpm +endif +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +MATCHBOX_DEPENDENCIES += xlib_libXft +endif + +ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +MATCHBOX_CONF_OPTS += --enable-startup-notification +MATCHBOX_DEPENDENCIES += startup-notification +else +MATCHBOX_CONF_OPTS += --disable-startup-notification +endif + +$(eval $(autotools-package)) + +# After we called a package infra, we can include more files include $(sort $(wildcard package/matchbox/*/*.mk))