NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/matchbox: drop useless dependencies

Browse Source 
xlib-libXft is only needed when building a 'standalone' matchbox, which
means not using matchbox-lib.

But we *are* building matchbox-lib, and we do not support the standalone
mode (and probably won't, as even upstream says it is ugly, by lack of
theming).

Similarly, xlib-libXext is only used for its 'xsync' extension, for
which support is entirely commented-out in matchbox.

So, drop the dependency on xlib-libXft, and make it explicit we're not
building either standalone modes; drop xlib-libXext.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2015-06-03 22:41:41 +02:00 committed by Thomas Petazzoni
parent 14b6ea282f
commit d890098d05
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/matchbox/Config.in
View File

@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB select BR2_PACKAGE_MATCHBOX_LIB
help help

11
package/matchbox/matchbox.mk
View File

@ -11,15 +11,16 @@ MATCHBOX_LICENSE = GPLv2+
MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_LICENSE_FILES = COPYING
MATCHBOX_DEPENDENCIES = matchbox-lib MATCHBOX_DEPENDENCIES = matchbox-lib
MATCHBOX_CONF_OPTS = --enable-expat --disable-gconf --disable-composite MATCHBOX_CONF_OPTS = \
--enable-expat \
--disable-gconf \
--disable-composite \
--disable-standalone \
--disable-standalone-xft
# Workaround bug in configure script # Workaround bug in configure script
MATCHBOX_CONF_ENV = expat=yes MATCHBOX_CONF_ENV = expat=yes
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
MATCHBOX_DEPENDENCIES += xlib_libXft
endif
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
MATCHBOX_CONF_OPTS += --enable-startup-notification MATCHBOX_CONF_OPTS += --enable-startup-notification
MATCHBOX_DEPENDENCIES += startup-notification MATCHBOX_DEPENDENCIES += startup-notification