Patchwork [17/28] libgtk2: replace dependency on X.org server by dependency on libraries

login
register
mail settings
Submitter Thomas Petazzoni
Date Jan. 6, 2013, 9:29 p.m.
Message ID <85bd537959bc6cf985757894bbbdaf854e7134a6.1357507764.git.thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/209817/
State Accepted
Headers show

Comments

Thomas Petazzoni - Jan. 6, 2013, 9:29 p.m.
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.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgtk2/Config.in  |    5 +++++
 package/libgtk2/libgtk2.mk |    3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
Peter Korsgaard - Jan. 12, 2013, 9:44 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> libgtk2 is a X client library, so it doesn't make sense for it to
 Thomas> depend on the X.org server. Instead, it should depend on the X client
 Thomas> libraries.

 Thomas> This patch therefore replaces the dependency on the X server by a
 Thomas> dependency on libX11, libXext, libXrender and fontconfig, that are the
 Thomas> mandatory requirements to build the X backend of Gtk.

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/libgtk2/Config.in  |    5 +++++
 Thomas>  package/libgtk2/libgtk2.mk |    3 ++-
 Thomas>  2 files changed, 7 insertions(+), 1 deletion(-)

 Thomas> diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
 Thomas> index efaf12f..42aef4b 100644
 Thomas> --- a/package/libgtk2/Config.in
 Thomas> +++ b/package/libgtk2/Config.in
 Thomas> @@ -8,6 +8,10 @@ config BR2_PACKAGE_LIBGTK2
 Thomas>  	select BR2_PACKAGE_LIBGLIB2
 Thomas>  	select BR2_PACKAGE_PANGO
 Thomas>  	select BR2_PACKAGE_GDK_PIXBUF
 Thomas> +	select BR2_PACKAGE_FONTCONFIG if BR2_PACKAGE_XORG7
 Thomas> +	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 Thomas> +	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 Thomas> +	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7
 Thomas>  	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
 Thomas>  	depends on BR2_USE_WCHAR # glib2
 Thomas>  	depends on BR2_INSTALL_LIBSTDCPP # pango
 Thomas> @@ -19,6 +23,7 @@ config BR2_PACKAGE_LIBGTK2
 Thomas>  config BR2_PACKAGE_LIBGTK2_DEMO
 Thomas>  	bool "Install libgtk2 demo program"
 Thomas>  	depends on BR2_PACKAGE_LIBGTK2
 Thomas> +
 Thomas>  	help

This empty line shouldn't be there. Committed without this change,
thanks.

Patch

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index efaf12f..42aef4b 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
@@ -19,6 +23,7 @@  config BR2_PACKAGE_LIBGTK2
 config BR2_PACKAGE_LIBGTK2_DEMO
 	bool "Install libgtk2 demo program"
 	depends on BR2_PACKAGE_LIBGTK2
+
 	help
 	  The GTK+ source base contains a gtk-demo program. This
 	  option allows to install this program to the target.
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