Move all to deprecated folder.
This commit is contained in:
@@ -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 */
|
||||
34
deprecated/firmware/buildroot/package/matchbox/Config.in
Normal file
34
deprecated/firmware/buildroot/package/matchbox/Config.in
Normal file
@@ -0,0 +1,34 @@
|
||||
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
|
||||
@@ -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
|
||||
46
deprecated/firmware/buildroot/package/matchbox/matchbox.mk
Normal file
46
deprecated/firmware/buildroot/package/matchbox/matchbox.mk
Normal file
@@ -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 = GPLv2+
|
||||
MATCHBOX_LICENSE_FILES = COPYING
|
||||
|
||||
MATCHBOX_DEPENDENCIES = 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))
|
||||
Reference in New Issue
Block a user