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

metacity: fix X.org dependencies

Browse Source 
Metacity is a X client application, so there is no reason to depend on
the X.org server. Instead, depend on the appropriate X libraries.

In addition to the X.org related dependencies, we also add the
host-libxml-parser-perl dependency, otherwise:

  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
  make[1]: *** [/home/test/outputs/xorg/build/metacity-2.25.1/.stamp_configured] Error 1
  make: *** [all] Error 2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2013-01-06 11:29:34 +00:00 committed by Peter Korsgaard
parent 3ba6d3815d
commit bfee0ba5dd
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/metacity/Config.in
View File

@ -2,5 +2,15 @@ config BR2_PACKAGE_METACITY
bool "metacity" bool "metacity"
depends on BR2_PACKAGE_LIBGTK2 depends on BR2_PACKAGE_LIBGTK2
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11
# Metacity configure.ac pretends it can be built without
# Composite, but in reality, it doesn't build.
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXDAMAGE
# We do not directly depend on Xft, but they are needed to get
# Xft support in Pango, which we require.
select BR2_PACKAGE_XLIB_LIBXFT
help help
Metacity is a window manager for the X Window System. Metacity is a window manager for the X Window System.

12
package/metacity/metacity.mk
View File

@ -17,7 +17,17 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-sm --disable-startup-notification --disable-sm --disable-startup-notification
METACITY_DEPENDENCIES = libgtk2 xserver_xorg-server METACITY_DEPENDENCIES = libgtk2 \
xlib_libX11 \
host-libxml-parser-perl \
xlib_libXcomposite \
xlib_libXfixes \
xlib_libXrender \
xlib_libXdamage
ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
METACITY_DEPENDENCIES += xlib_libXcursor
endif
define METACITY_INSTALL_XSESSION define METACITY_INSTALL_XSESSION
install -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession install -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession