[Buildroot] [PATCH 0/3] Re-introducing libgtk3

[Buildroot] [PATCH 0/3] Re-introducing libgtk3

[Eric Le Bihan]

Hi!

This small series re-introduces libgtk3.

The following changes have been made to the latest version posted by H.
Bouteville:

 - Introduction of pkg-config-native, provided by host-pkgconf. This variant
   of pkg-config uses the host sysroot and is needed by the Gtk+ build system
   to build some tools.
 - Add multiple backend support (X11, Wayland, Broadway).
 - GSettings schemas compilation after installation (needed by gtk3-demo).
 - Introduction of hicolor-icon-theme (needed by gtk3-demo).

The following tests have been performed:

 - running gtk3-demo in QEMU x86/ARM in a X11/Fluxbox environment.
 - running gtk3-demo in QEMU x86/ARM in a Wayland/Weston environment.

Note: since wayland has been bumped to 1.6.0, running gtk3-demo in Weston does
not work anymore. Gtk+ 3.12.2 uses protocol version 3, whereas wayland 1.6.0
introduces version 4. A runtime check is performed and the program refuses to
start. This is solved with Gtk+ 3.14.0. Once this series is accepted, I will
provide a series bumping libgtk3 and friends (libglib2, pango, etc).

Best regards,
ELB

Eric Le Bihan (2):
  host-pkgconf: install pkg-config-native
  hicolor-icon-theme: new package

Hadrien Boutteville (1):
  libgtk3: new package

 package/Config.in                                  |   2 +
 package/hicolor-icon-theme/Config.in               |   4 +
 package/hicolor-icon-theme/hicolor-icon-theme.mk   |  12 ++
 package/libgtk3/Config.in                          |  87 +++++++++++
 package/libgtk3/libgtk3-0001-no-gtk-doc.patch      |  25 +++
 .../libgtk3-0002-fix-introspection-check.patch     |  28 ++++
 .../libgtk3/libgtk3-0003-disable-atk-bridge.patch  |  45 ++++++
 package/libgtk3/libgtk3.mk                         | 174 +++++++++++++++++++++
 package/pkgconf/pkg-config-native.in               |   3 +
 package/pkgconf/pkgconf.mk                         |   8 +
 10 files changed, 388 insertions(+)
 create mode 100644 package/hicolor-icon-theme/Config.in
 create mode 100644 package/hicolor-icon-theme/hicolor-icon-theme.mk
 create mode 100644 package/libgtk3/Config.in
 create mode 100644 package/libgtk3/libgtk3-0001-no-gtk-doc.patch
 create mode 100644 package/libgtk3/libgtk3-0002-fix-introspection-check.patch
 create mode 100644 package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
 create mode 100644 package/libgtk3/libgtk3.mk
 create mode 100644 package/pkgconf/pkg-config-native.in

--
1.9.1

[Buildroot] [PATCH 1/3] host-pkgconf: install pkg-config-native

[Eric Le Bihan]

The package host-pkgconf now provides `pkg-config-native`, which uses the
host native sysroot. It is useful for packages which compile build-time
helper tools (such as Gtk+ 3.0).

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 package/pkgconf/pkg-config-native.in | 3 +++
 package/pkgconf/pkgconf.mk           | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 package/pkgconf/pkg-config-native.in

diff --git a/package/pkgconf/pkg-config-native.in b/package/pkgconf/pkg-config-native.in
new file mode 100644
index 0000000..7e25cd2
--- /dev/null
+++ b/package/pkgconf/pkg-config-native.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+PKG_CONFIG_LIBDIR=@HOST_DIR@/usr/lib/pkgconfig:@HOST_DIR@/usr/share/pkgconfig @HOST_DIR@/usr/bin/pkgconf $@
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index c961536..b6e7c12 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -24,6 +24,13 @@ define HOST_PKGCONF_INSTALL_WRAPPER
 		$(HOST_DIR)/usr/bin/pkg-config
 endef
 
+define HOST_PKGCONF_INSTALL_NATIVE
+	$(INSTALL) -m 0755 -D package/pkgconf/pkg-config-native.in \
+		$(HOST_DIR)/usr/bin/pkg-config-native
+	$(SED) 's, at HOST_DIR@,$(HOST_DIR),g' \
+		$(HOST_DIR)/usr/bin/pkg-config-native
+endef
+
 define HOST_PKGCONF_STATIC
 	$(SED) 's, at STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config
 endef
@@ -34,6 +41,7 @@ endef
 
 PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
 HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
+HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_NATIVE
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 	HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
-- 
1.9.1

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Eric Le Bihan]

This new package provides Freedesktop Hicolor icon theme.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 package/Config.in                                |  1 +
 package/hicolor-icon-theme/Config.in             |  4 ++++
 package/hicolor-icon-theme/hicolor-icon-theme.mk | 12 ++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 package/hicolor-icon-theme/Config.in
 create mode 100644 package/hicolor-icon-theme/hicolor-icon-theme.mk

diff --git a/package/Config.in b/package/Config.in
index 2eefc3f..1fa2398 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -622,6 +622,7 @@ menu "Graphics"
 	source "package/gtk2-engines/Config.in"
 	source "package/gtk2-themes/Config.in"
 	source "package/harfbuzz/Config.in"
+	source "package/hicolor-icon-theme/Config.in"
 	source "package/imlib2/Config.in"
 	source "package/jasper/Config.in"
 	source "package/jpeg/Config.in"
diff --git a/package/hicolor-icon-theme/Config.in b/package/hicolor-icon-theme/Config.in
new file mode 100644
index 0000000..b1c66f6
--- /dev/null
+++ b/package/hicolor-icon-theme/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_HICOLOR_ICON_THEME
+	bool "hicolor icon theme"
+	help
+	  Freedesktop Hicolor icon theme
diff --git a/package/hicolor-icon-theme/hicolor-icon-theme.mk b/package/hicolor-icon-theme/hicolor-icon-theme.mk
new file mode 100644
index 0000000..768aec8
--- /dev/null
+++ b/package/hicolor-icon-theme/hicolor-icon-theme.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# hicolor-icon-theme
+#
+################################################################################
+
+HICOLOR_ICON_THEME_VERSION = 0.13
+HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases/
+HICOLOR_ICON_THEME_LICENSE = GPLv2
+HICOLOR_ICON_THEME_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
-- 
1.9.1

[Buildroot] [PATCH 3/3] libgtk3: new package

[Eric Le Bihan]

From: Hadrien Boutteville <hadrien.boutteville@gmail.com>

This package provides Gtk+ 3.0, a graphical toolkit.

Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
[Eric: added backend support, dependency on pkg-config-native]
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
 package/Config.in                                  |   1 +
 package/libgtk3/Config.in                          |  87 +++++++++++
 package/libgtk3/libgtk3-0001-no-gtk-doc.patch      |  25 +++
 .../libgtk3-0002-fix-introspection-check.patch     |  28 ++++
 .../libgtk3/libgtk3-0003-disable-atk-bridge.patch  |  45 ++++++
 package/libgtk3/libgtk3.mk                         | 174 +++++++++++++++++++++
 6 files changed, 360 insertions(+)
 create mode 100644 package/libgtk3/Config.in
 create mode 100644 package/libgtk3/libgtk3-0001-no-gtk-doc.patch
 create mode 100644 package/libgtk3/libgtk3-0002-fix-introspection-check.patch
 create mode 100644 package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
 create mode 100644 package/libgtk3/libgtk3.mk

diff --git a/package/Config.in b/package/Config.in
index 1fa2398..0f0949c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -638,6 +638,7 @@ menu "Graphics"
 	source "package/libglew/Config.in"
 	source "package/libglu/Config.in"
 	source "package/libgtk2/Config.in"
+	source "package/libgtk3/Config.in"
 	source "package/libpng/Config.in"
 	source "package/libqrencode/Config.in"
 	source "package/libraw/Config.in"
diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
new file mode 100644
index 0000000..94791b8
--- /dev/null
+++ b/package/libgtk3/Config.in
@@ -0,0 +1,87 @@
+config BR2_PACKAGE_LIBGTK3
+	bool "libgtk3"
+	select BR2_PACKAGE_ATK
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_PS
+	select BR2_PACKAGE_CAIRO_PDF
+	select BR2_PACKAGE_CAIRO_SVG
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PANGO
+	select BR2_PACKAGE_GDK_PIXBUF
+	depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
+	help
+	  The GTK+ version 3 graphical user interface library
+
+	  http://www.gtk.org/
+
+if BR2_PACKAGE_LIBGTK3
+
+comment "GDK backend"
+
+config BR2_PACKAGE_LIBGTK3_X11
+	bool "GDK X11 backend"
+	default y
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXI
+	help
+	  This enables the X11 backend for GDK.
+
+config BR2_PACKAGE_LIBGTK3_WAYLAND
+	bool "GDK Wayland backend"
+	default y
+	depends on BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
+	help
+	  This enables the Wayland backend for GDK.
+
+config BR2_PACKAGE_LIBGTK3_BROADWAY
+	bool "GDK Broadway backend"
+	default n
+	help
+	  This enables the Broadway backend for GDK, which provides support
+	  for displaying GTK+ applications in a web browser, using HTML5 and
+	  web sockets.
+
+	  For example, to run gtk3-demo on a target which IP address is
+	  192.168.0.1 and use it from a web browser, execute the following
+	  commands:
+
+	    $ broadwayd -a 192.168.0.1 -p 8080 :2 &
+	    $ export GDK_BACKEND=broadway
+	    $ export BROADWAY_DISPLAY=:2
+	    $ gtk3-demo
+
+	  Then open a web browser at address http://192.168.0.1:8080.
+	  Javascript and web sockets should be enabled.
+
+config BR2_PACKAGE_LIBGTK3_DEMO
+	bool "Install libgtk3 demo program"
+	select BR2_PACKAGE_SHARED_MIME_INFO
+	select BR2_PACKAGE_HICOLOR_ICON_THEME
+	help
+	  The GTK+ source base contains a demo program. This
+	  option allows to install this program to the target.
+
+config BR2_PACKAGE_LIBGTK3_TESTS
+	bool "Install libgtk3 tests"
+	help
+	  The GTK+ source base contains tests. This option
+	  allows to install them to the target.
+
+endif
+
+comment "libgtk3 needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
+	depends on BR2_ARCH_HAS_ATOMICS
+	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_WAYLAND
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgtk3/libgtk3-0001-no-gtk-doc.patch b/package/libgtk3/libgtk3-0001-no-gtk-doc.patch
new file mode 100644
index 0000000..926a263
--- /dev/null
+++ b/package/libgtk3/libgtk3-0001-no-gtk-doc.patch
@@ -0,0 +1,25 @@
+Same patch as for systemd in commit
+7144f2f04b705538a893e538a6b851f536f433b6:
+
+Fix deactivation of gtk-doc
+
+The tarball contains the Makefile for building documentation with gtk-doc,
+Unfortunately the AM_CONDITIONAL variable is not the correct one, which
+results in an error when running autoreconf.
+
+This patch fixes this issue.
+
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
+
+--- a/gtk-doc.make
++++ b/gtk-doc.make
+@@ -267,7 +267,7 @@
+ #
+ # Require gtk-doc when making dist
+ #
+-if HAVE_GTK_DOC
++if ENABLE_GTK_DOC
+ dist-check-gtkdoc: docs
+ else
+ dist-check-gtkdoc:
diff --git a/package/libgtk3/libgtk3-0002-fix-introspection-check.patch b/package/libgtk3/libgtk3-0002-fix-introspection-check.patch
new file mode 100644
index 0000000..5b56b3a
--- /dev/null
+++ b/package/libgtk3/libgtk3-0002-fix-introspection-check.patch
@@ -0,0 +1,28 @@
+Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
+
+During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolve because we
+don't have introspection which provides its custom m4 macro. Reconfigure fails
+with:
+
+gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
+gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
+
+We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by
+adding a check, as performed in Systemd.
+
+Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1621,7 +1621,10 @@
+ # GObject introspection
+ ##################################################
+
+-GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
++m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
++         [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)],
++         [AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
++          enable_introspection=no])
+
+ ##################################################
+ # colord module
diff --git a/package/libgtk3/libgtk3-0003-disable-atk-bridge.patch b/package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
new file mode 100644
index 0000000..30ff92d
--- /dev/null
+++ b/package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
@@ -0,0 +1,45 @@
+Remove atk-bridge support.
+
+atk-bridge doesn't seem useful for now in Buildroot and requires to
+add two new packages just for it: at-spi2-core and at-spi2-atk.
+
+Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1349,11 +1349,7 @@
+ # Check for Accessibility Toolkit flags
+ ########################################
+
+-if test x$enable_x11_backend = xyes; then
+-   ATK_PACKAGES="atk atk-bridge-2.0"
+-else
+-   ATK_PACKAGES="atk"
+-fi
++ATK_PACKAGES="atk"
+
+ PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+
+--- a/gtk/a11y/gtkaccessibility.c
++++ b/gtk/a11y/gtkaccessibility.c
+@@ -37,10 +37,6 @@
+ #include <gtk/gtkcombobox.h>
+ #include <gtk/gtkaccessible.h>
+
+-#ifdef GDK_WINDOWING_X11
+-#include <atk-bridge.h>
+-#endif
+-
+ static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
+                                          guint                  n_param_values,
+                                          const GValue          *param_values,
+@@ -987,9 +983,5 @@
+   _gtk_accessibility_override_atk_util ();
+   do_window_event_initialization ();
+
+-#ifdef GDK_WINDOWING_X11
+-  atk_bridge_adaptor_init (NULL, NULL);
+-#endif
+-
+   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
new file mode 100644
index 0000000..523d8f1
--- /dev/null
+++ b/package/libgtk3/libgtk3.mk
@@ -0,0 +1,174 @@
+################################################################################
+#
+# libgtk3
+#
+################################################################################
+
+LIBGTK3_VERSION_MAJOR = 3.12
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).2
+LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
+LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
+LIBGTK3_LICENSE = LGPLv2+
+LIBGTK3_LICENSE_FILES = COPYING
+LIBGTK3_INSTALL_STAGING = YES
+LIBGTK3_AUTORECONF = YES
+
+LIBGTK3_CONF_ENV = \
+	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
+	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource
+
+LIBGTK3_CONF_ENV  = ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
+		    ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
+		    PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/usr/bin/pkg-config-native
+
+LIBGTK3_CONF_OPT = --disable-glibtest \
+	--enable-explicit-deps=no \
+	--enable-gtk2-dependency \
+	--disable-debug \
+	--disable-introspection
+
+LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango gdk-pixbuf
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi
+
+LIBGTK3_CONF_OPT += \
+	--enable-x11-backend \
+	--x-includes=$(STAGING_DIR)/usr/include/X11 \
+	--x-libraries=$(STAGING_DIR)/usr/lib
+else
+LIBGTK3_CONF_OPT += --disable-x11-backend
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
+LIBGTK3_DEPENDENCIES += wayland libxkbcommon
+LIBGTK3_CONF_OPT += --enable-wayland-backend
+else
+LIBGTK3_CONF_OPT += --disable-wayland-backend
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y)
+LIBGTK3_CONF_OPT += --enable-broadway-backend
+else
+LIBGTK3_CONF_OPT += --disable-broadway-backend
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+LIBGTK3_CONF_OPT += --enable-xinerama
+LIBGTK3_DEPENDENCIES += xlib_libXinerama
+else
+LIBGTK3_CONF_OPT += --disable-xinerama
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+LIBGTK3_CONF_OPT += --enable-xrandr
+LIBGTK3_DEPENDENCIES += xlib_libXrandr
+else
+LIBGTK3_CONF_OPT += --disable-xrandr
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+LIBGTK3_DEPENDENCIES += xlib_libXcursor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+LIBGTK3_CONF_OPT += --enable-xfixes
+LIBGTK3_DEPENDENCIES += xlib_libXfixes
+else
+LIBGTK3_CONF_OPT += --disable-xfixes
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
+LIBGTK3_CONF_OPT += --enable-xcomposite
+LIBGTK3_DEPENDENCIES += xlib_libXcomposite
+else
+LIBGTK3_CONF_OPT += --disable-xcomposite
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
+LIBGTK3_CONF_OPT += --enable-xdamage
+LIBGTK3_DEPENDENCIES += xlib_libXdamage
+else
+LIBGTK3_CONF_OPT += --disable-xdamage
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
+LIBGTK3_CONF_OPT += --enable-xkb
+LIBGTK3_DEPENDENCIES += xlib_libxkbfile
+else
+LIBGTK3_CONF_OPT += --disable-xkb
+endif
+
+ifeq ($(BR2_PACKAGE_CUPS),y)
+LIBGTK3_CONF_OPT += --enable-cups
+LIBGTK3_DEPENDENCIES += cups
+else
+LIBGTK3_CONF_OPT += --disable-cups
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y)
+LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info
+else
+define LIBGTK3_REMOVE_DEMOS
+	$(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \
+		$(TARGET_DIR)/usr/bin/gtk3-demo-application
+endef
+LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y)
+LIBGTK3_CONF_OPT += --enable-installed-tests
+else
+LIBGTK3_CONF_OPT += --disable-installed-tests
+endif
+
+define LIBGTK3_COMPILE_GLIB_SCHEMAS
+	$(HOST_DIR)/usr/bin/glib-compile-schemas \
+		$(TARGET_DIR)/usr/share/glib-2.0/schemas
+endef
+
+LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_COMPILE_GLIB_SCHEMAS
+
+# gtk+ >= 3.10 can build a native version of gtk-update-icon-cache if
+# --enable-gtk2-dependency=no is set when invoking './configure'.
+#
+# Unfortunately, if the target toolchain is based on uClibc, the macro
+# AM_GLIB_GNU_GETTEXT will detect the libintl built for the target and
+# will add '-lintl' to the default list of libraries for the linker (used
+# for both native and target builds).
+#
+# But no native version of libintl is available (the functions are
+# provided by glibc). So gtk-update-icon-cache will not build.
+#
+# As a workaround, we build gtk-update-icon-cache on our own, set
+# --enable-gtk2-dependency=yes and force './configure' to use our version.
+
+HOST_LIBGTK3_DEPENDENCIES = \
+	host-libglib2 \
+	host-libpng \
+	host-gdk-pixbuf \
+	host-pkgconf
+
+HOST_LIBGTK3_CFLAGS = $(shell $(HOST_DIR)/usr/bin/pkg-config-native \
+		      --cflags --libs gdk-pixbuf-2.0)
+
+define HOST_LIBGTK3_CONFIGURE_CMDS
+	echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
+	echo "#define HAVE_UNISTD_H 1" >> $(@D)/gtk/config.h
+	echo "#define HAVE_FTW_H 1" >> $(@D)/gtk/config.h
+endef
+
+define HOST_LIBGTK3_BUILD_CMDS
+	$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+		$(@D)/gtk/updateiconcache.c \
+		$(HOST_LIBGTK3_CFLAGS) \
+		-o $(@D)/gtk/gtk-update-icon-cache
+endef
+
+define HOST_LIBGTK3_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \
+		$(HOST_DIR)/usr/bin/gtk-update-icon-cache
+endef
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
1.9.1

[Buildroot] [PATCH 3/3] libgtk3: new package

[Vicente Olivert Riera]

On 09/23/2014 05:21 PM, Eric Le Bihan wrote:
> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
> new file mode 100644
> index 0000000..523d8f1
> --- /dev/null
> +++ b/package/libgtk3/libgtk3.mk
> @@ -0,0 +1,174 @@
> +################################################################################
> +#
> +# libgtk3
> +#
> +################################################################################
> +
> +LIBGTK3_VERSION_MAJOR = 3.12
> +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).2

Since you are planing to add a new package, why not use the latests 
version of it? 3.14.0

-- 
Vincent

[Buildroot] [PATCH 3/3] libgtk3: new package

[Gustavo Zacarias]

On 09/23/2014 01:23 PM, Vicente Olivert Riera wrote:

> Since you are planing to add a new package, why not use the latests
> version of it? 3.14.0

Probably because it needs a libglib2, atk, cairo and whatnot bump as well.
And since it was just released in this case in particular i'd go for
safe so as to get this in sooner rather than later - the bump can be a
new patchset afterwards.
Regards.

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Tue, 23 Sep 2014 18:21:10 +0200, Eric Le Bihan wrote:
> This new package provides Freedesktop Hicolor icon theme.
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> ---
>  package/Config.in                                |  1 +
>  package/hicolor-icon-theme/Config.in             |  4 ++++
>  package/hicolor-icon-theme/hicolor-icon-theme.mk | 12 ++++++++++++
>  3 files changed, 17 insertions(+)
>  create mode 100644 package/hicolor-icon-theme/Config.in
>  create mode 100644 package/hicolor-icon-theme/hicolor-icon-theme.mk

I'm a bit confused by what this package does: it doesn't contain
anything, and does not install anything except a huge number of
directories (empty) in usr/share/icons/. Is this the intended behavior?
I would have expected an icon theme to install some .svg or .png files,
no?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] host-pkgconf: install pkg-config-native

[Peter Korsgaard]

>>>>> "Eric" == Eric Le Bihan <eric.le.bihan.dev@free.fr> writes:

 > The package host-pkgconf now provides `pkg-config-native`, which uses the
 > host native sysroot. It is useful for packages which compile build-time
 > helper tools (such as Gtk+ 3.0).

 > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
 > ---
 >  package/pkgconf/pkg-config-native.in | 3 +++
 >  package/pkgconf/pkgconf.mk           | 8 ++++++++
 >  2 files changed, 11 insertions(+)
 >  create mode 100644 package/pkgconf/pkg-config-native.in

 > diff --git a/package/pkgconf/pkg-config-native.in b/package/pkgconf/pkg-config-native.in
 > new file mode 100644
 > index 0000000..7e25cd2
 > --- /dev/null
 > +++ b/package/pkgconf/pkg-config-native.in
 > @@ -0,0 +1,3 @@
 > +#!/bin/sh
 > +
 > +PKG_CONFIG_LIBDIR=@HOST_DIR@/usr/lib/pkgconfig:@HOST_DIR@/usr/share/pkgconfig @HOST_DIR@/usr/bin/pkgconf $@

Why is that needed? host-pkgconf is already built with
--prefix=$HOST_DIR/usr, so it does the right thing:

strace output/host/usr/bin/pkgconf --cflags blah 2>&1 |grep blah                      ~/source/buildroot
execve("output/host/usr/bin/pkgconf", ["output/host/usr/bin/pkgconf", "--cflags", "blah"], [/* 50 vars */]) = 0
open("/home/peko/source/buildroot/output/host/usr/lib/pkgconfig/blah-uninstalled.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/home/peko/source/buildroot/output/host/usr/lib/pkgconfig/blah.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/home/peko/source/buildroot/output/host/usr/share/pkgconfig/blah-uninstalled.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/home/peko/source/buildroot/output/host/usr/share/pkgconfig/blah.pc", O_RDONLY) = -1 ENOENT (No such file or directory)

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/3] host-pkgconf: install pkg-config-native

[Eric Le Bihan]

Hi!

On Mon, Oct 06, 2014 at 09:47:17PM +0200, Peter Korsgaard wrote:
> >>>>> "Eric" == Eric Le Bihan <eric.le.bihan.dev@free.fr> writes:
>
>  > The package host-pkgconf now provides `pkg-config-native`, which uses the
>  > host native sysroot. It is useful for packages which compile build-time
>  > helper tools (such as Gtk+ 3.0).
>
>  > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>  > ---
>  >  package/pkgconf/pkg-config-native.in | 3 +++
>  >  package/pkgconf/pkgconf.mk           | 8 ++++++++
>  >  2 files changed, 11 insertions(+)
>  >  create mode 100644 package/pkgconf/pkg-config-native.in
>
>  > diff --git a/package/pkgconf/pkg-config-native.in b/package/pkgconf/pkg-config-native.in
>  > new file mode 100644
>  > index 0000000..7e25cd2
>  > --- /dev/null
>  > +++ b/package/pkgconf/pkg-config-native.in
>  > @@ -0,0 +1,3 @@
>  > +#!/bin/sh
>  > +
>  > +PKG_CONFIG_LIBDIR=@HOST_DIR@/usr/lib/pkgconfig:@HOST_DIR@/usr/share/pkgconfig @HOST_DIR@/usr/bin/pkgconf $@
>
> Why is that needed? host-pkgconf is already built with
> --prefix=$HOST_DIR/usr, so it does the right thing:
>
> strace output/host/usr/bin/pkgconf --cflags blah 2>&1 |grep blah                      ~/source/buildroot
> execve("output/host/usr/bin/pkgconf", ["output/host/usr/bin/pkgconf", "--cflags", "blah"], [/* 50 vars */]) = 0
> open("/home/peko/source/buildroot/output/host/usr/lib/pkgconfig/blah-uninstalled.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
> open("/home/peko/source/buildroot/output/host/usr/lib/pkgconfig/blah.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
> open("/home/peko/source/buildroot/output/host/usr/share/pkgconfig/blah-uninstalled.pc", O_RDONLY) = -1 ENOENT (No such file or directory)
> open("/home/peko/source/buildroot/output/host/usr/share/pkgconfig/blah.pc", O_RDONLY) = -1 ENOENT (No such file or directory)

Of course! No need to re-invent the wheel! Thanks for pointing it out. I will
remove this patch and update the one for libgtk3.

Best regards,
ELB

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Eric Le Bihan]

Hi!

On Sun, Oct 05, 2014 at 11:22:15PM +0200, Thomas Petazzoni wrote:
> Dear Eric Le Bihan,
>
> On Tue, 23 Sep 2014 18:21:10 +0200, Eric Le Bihan wrote:
> > This new package provides Freedesktop Hicolor icon theme.
> >
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> > ---
> >  package/Config.in                                |  1 +
> >  package/hicolor-icon-theme/Config.in             |  4 ++++
> >  package/hicolor-icon-theme/hicolor-icon-theme.mk | 12 ++++++++++++
> >  3 files changed, 17 insertions(+)
> >  create mode 100644 package/hicolor-icon-theme/Config.in
> >  create mode 100644 package/hicolor-icon-theme/hicolor-icon-theme.mk
>
> I'm a bit confused by what this package does: it doesn't contain
> anything, and does not install anything except a huge number of
> directories (empty) in usr/share/icons/. Is this the intended behavior?
> I would have expected an icon theme to install some .svg or .png files,
> no?

The hicolor icon theme is the *fallback* icon theme. As explained in the
specifications [1], this theme is required to have a place for third-party
applications to install their icons. If a icon is not found in the current
theme, then hicolor is the theme to look into.

So the package just installs a directory structure as well as an index.

I added it to avoid some warnings when executing the gtk3-demo application.

When I'll provide a patch bumping libgtk3 to 3.14, I will also provide a
package for adwaita-icon-theme, which is a true icon theme, weighting 18 MB!

[1] http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html

Best regards,
ELB

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Tue, 7 Oct 2014 14:25:15 +0200, Eric Le Bihan wrote:

> > I'm a bit confused by what this package does: it doesn't contain
> > anything, and does not install anything except a huge number of
> > directories (empty) in usr/share/icons/. Is this the intended behavior?
> > I would have expected an icon theme to install some .svg or .png files,
> > no?
> 
> The hicolor icon theme is the *fallback* icon theme. As explained in the
> specifications [1], this theme is required to have a place for third-party
> applications to install their icons. If a icon is not found in the current
> theme, then hicolor is the theme to look into.
> 
> So the package just installs a directory structure as well as an index.

Well, how can an empty thing be a fallback icon theme? That's kind of
weird.

Anyway, if you could update the help text to mention what it is
exactly, it'd be great. Just to clarify to the user that it's normal
for this package to not install anything except a bunch of empty
directories.

> I added it to avoid some warnings when executing the gtk3-demo application.

Sure, I certainly don't claim that it is unnecessary, I was just trying
to understand what was going on.

> When I'll provide a patch bumping libgtk3 to 3.14, I will also provide a
> package for adwaita-icon-theme, which is a true icon theme, weighting 18 MB!

Ouch. But all icons are present in multiple sizes, no? Are all sizes
needed?

Just looked at my /usr/share/icons on Ubuntu: 347 MB. Ouch.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Mike Zick]

On Tue, 7 Oct 2014 14:28:42 +0200
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> > When I'll provide a patch bumping libgtk3 to 3.14, I will also
> > provide a package for adwaita-icon-theme, which is a true icon
> > theme, weighting 18 MB!  
> 
> Ouch. But all icons are present in multiple sizes, no? Are all sizes
> needed?
> 
> Just looked at my /usr/share/icons on Ubuntu: 347 MB. Ouch.
>

What an opportunity!!!

Let's get the manufacturers of embedded memory devices to become
regular supporters of the Buildroot project before we do that.
;)

Just point out how many 500MB devices they could sell in addition
to what their customers are buying now.

Mike

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Eric Le Bihan]

On Tue, Oct 07, 2014 at 02:28:42PM +0200, Thomas Petazzoni wrote:
> Dear Eric Le Bihan,
>
> On Tue, 7 Oct 2014 14:25:15 +0200, Eric Le Bihan wrote:
>
> > > I'm a bit confused by what this package does: it doesn't contain
> > > anything, and does not install anything except a huge number of
> > > directories (empty) in usr/share/icons/. Is this the intended behavior?
> > > I would have expected an icon theme to install some .svg or .png files,
> > > no?
> >
> > The hicolor icon theme is the *fallback* icon theme. As explained in the
> > specifications [1], this theme is required to have a place for third-party
> > applications to install their icons. If a icon is not found in the current
> > theme, then hicolor is the theme to look into.
> >
> > So the package just installs a directory structure as well as an index.
>
> Well, how can an empty thing be a fallback icon theme? That's kind of
> weird.
>
> Anyway, if you could update the help text to mention what it is
> exactly, it'd be great. Just to clarify to the user that it's normal
> for this package to not install anything except a bunch of empty
> directories.

Of course!

> > I added it to avoid some warnings when executing the gtk3-demo application.
>
> Sure, I certainly don't claim that it is unnecessary, I was just trying
> to understand what was going on.
>
> > When I'll provide a patch bumping libgtk3 to 3.14, I will also provide a
> > package for adwaita-icon-theme, which is a true icon theme, weighting 18 MB!
>
> Ouch. But all icons are present in multiple sizes, no? Are all sizes
> needed?

The adwaita-icon-theme package provides icons which sizes are 16x16, 24x24,
32x32, 48x48, 256x256 and of course some SVG ones. On the target its takes 20
MB of storage.

I'm no expert in icon loading, but it looks like if the requested size is not
found, then a smaller one is selected, upscaling is applied and you get
blurry icons.

Should I provide an option in the configuration menu to install only specific
sizes, or should removing the unwanted icons be left to the user (via
post-build script)?

Best regards,
ELB

[Buildroot] [PATCH 2/3] hicolor-icon-theme: new package

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Tue, 7 Oct 2014 14:55:36 +0200, Eric Le Bihan wrote:

> > > I added it to avoid some warnings when executing the gtk3-demo application.
> >
> > Sure, I certainly don't claim that it is unnecessary, I was just trying
> > to understand what was going on.
> >
> > > When I'll provide a patch bumping libgtk3 to 3.14, I will also provide a
> > > package for adwaita-icon-theme, which is a true icon theme, weighting 18 MB!
> >
> > Ouch. But all icons are present in multiple sizes, no? Are all sizes
> > needed?
> 
> The adwaita-icon-theme package provides icons which sizes are 16x16, 24x24,
> 32x32, 48x48, 256x256 and of course some SVG ones. On the target its takes 20
> MB of storage.
> 
> I'm no expert in icon loading, but it looks like if the requested size is not
> found, then a smaller one is selected, upscaling is applied and you get
> blurry icons.
> 
> Should I provide an option in the configuration menu to install only specific
> sizes, or should removing the unwanted icons be left to the user (via
> post-build script)?

I'm not sure. As long as we can build libgtk3 without those icons, I
think we can just keep them all. Anyway, this is something that can be
improved at a later point if needed.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com