summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:29 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-12 21:44:51 (GMT)
commit0e55b8dc8ac082ab8adb48dc790a4105a7630304 (patch)
treed8f480c5edb7cc7c6a465940e826cd4a14dae720
parente28272314b3e014e780ac44b9015da24292966a4 (diff)
downloadbuildroot-0e55b8dc8ac082ab8adb48dc790a4105a7630304.tar.gz
buildroot-0e55b8dc8ac082ab8adb48dc790a4105a7630304.tar.bz2
libgtk2: replace dependency on X.org server by dependency on libraries
libgtk2 is a X client library, so it doesn't make sense for it to depend on the X.org server. Instead, it should depend on the X client libraries. This patch therefore replaces the dependency on the X server by a dependency on libX11, libXext, libXrender and fontconfig, that are the mandatory requirements to build the X backend of Gtk. [Peter: don't add an empty line before gtk demo help text] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libgtk2/Config.in4
-rw-r--r--package/libgtk2/libgtk2.mk3
2 files changed, 6 insertions, 1 deletions
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index efaf12f..3e8cf75 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -8,6 +8,10 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_GDK_PIXBUF
+ select BR2_PACKAGE_FONTCONFIG if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
depends on BR2_USE_WCHAR # glib2
depends on BR2_INSTALL_LIBSTDCPP # pango
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 9adb6b9..3dcecbf 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -82,7 +82,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
- LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server
+ LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
+ xlib_libXext xlib_libXrender
else
LIBGTK2_CONF_OPT += --without-x
endif