Bump packages before adding libgtk3

PATCH New Hadrien Boutteville 4 participants 10 messages Jun 18, 2014 – Jun 19, 2014

lore

Share & tools

lore

Hadrien Boutteville

author

2014-06-18 16:19 UTC #0 lore raw

cover Bump packages before adding libgtk3

Hello all,

I'm currently packaging libgtk3 (work in progress, patch soon), and this series bumps pango and libglib2 as it is necessary for libgtk3, and add Freetype support to Cairo.

This series is juste compiled-tested, so it's mostly an RFC. I will do running tests with libgtk3 and libgtk2.

Regards,

Hadrien

Hadrien Boutteville (3):
libglib2: bump to version 2.40.0
pango: bump to version 1.36.3
cairo: add freetype dependency for freetype support

 package/cairo/cairo.mk                             |   7 +
 ...ror-format-string-errors-from-mismatched-.patch |  56 ---
 package/libglib2/libglib2-0002-no-gtk-doc.patch    |  11 +
 package/libglib2/libglib2.mk                       |   4 +-
 package/pango/Config.in                            |   1 +
 package/pango/pango-0001-no-tests.patch            |  21 +
 package/pango/pango-0002-no-gtk-doc.patch          |  11 +
 package/pango/pango-no-const-return.patch          | 475 ---------------------
 package/pango/pango-no-tests.patch                 |  22 -
 package/pango/pango.mk                             |  19 +-
 10 files changed, 63 insertions(+), 564 deletions(-)
 delete mode 100644 package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
 create mode 100644 package/libglib2/libglib2-0002-no-gtk-doc.patch
 create mode 100644 package/pango/pango-0001-no-tests.patch
 create mode 100644 package/pango/pango-0002-no-gtk-doc.patch
 delete mode 100644 package/pango/pango-no-const-return.patch
 delete mode 100644 package/pango/pango-no-tests.patch

Signature · 1 line

2.0.0

Hadrien Boutteville

author

2014-06-18 16:19 UTC #1 lore raw

PATCH 1/3 libglib2: bump to version 2.40.0

Signed-off-by Hadrien Boutteville <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

---
 ...ror-format-string-errors-from-mismatched-.patch | 56 ----------------------
 package/libglib2/libglib2-0002-no-gtk-doc.patch    | 11 +++++
 package/libglib2/libglib2.mk                       |  4 +-
 3 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 100644 package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
 create mode 100644 package/libglib2/libglib2-0002-no-gtk-doc.patch

package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted +0 ~~-56~~

deleted file mode 100644
index 9b87d9d..0000000
@@ -1,56 +0,0 @@
-From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <[email protected]>
-Date: Wed, 25 Sep 2013 19:22:26 +1000
-Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
-
-Upstream-Status: Backport
-
----
- gio/gdbusmessage.c | 8 ++++----
- gio/gdbusprivate.c | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index ac233a3..ad77aa6 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
-                                           statbuf.st_mode);
-                   g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-                                           (guint64) statbuf.st_ino);
--                  g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_uid);
--                  g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_gid);
-+                  g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_uid);
-+                  g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_gid);
-                   g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
-                                           major (statbuf.st_rdev), minor (statbuf.st_rdev));
-                   g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 0e5bef2..785a0c0 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
-   _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
-            bytes_written,
-            g_dbus_message_get_serial (data->message),
-@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
-     _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
-            bytes_read,
-            serial,
--- 
-1.8.3.1
-

package/libglib2/libglib2-0002-no-gtk-doc.patch new file +11 -0

new file mode 100644
index 0000000..0c12ee4
@@ -0,0 +1,11 @@
+--- 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:

package/libglib2/libglib2.mk +2 -2

index 8df7c55..255b85d 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.38
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
+LIBGLIB2_VERSION_MAJOR = 2.40
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPLv2+

Signature · 1 line

2.0.0

Thomas De Schampheleire

2014-06-18 20:08 UTC #2 lore raw

PATCH 1/3 libglib2: bump to version 2.40.0

Hi Hadrien,

Hadrien Boutteville <[email protected]> schreef:

package/libglib2/libglib2-0002-no-gtk-doc.patch

Quoted 78 lines

Signed-off-by Hadrien Boutteville <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

---

...ror-format-string-errors-from-mismatched-.patch | 56 ----------------------
package/libglib2/libglib2-0002-no-gtk-doc.patch    | 11 +++++
package/libglib2/libglib2.mk                       |  4 +-
3 files changed, 13 insertions(+), 58 deletions(-)

delete mode 100644 package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch create mode 100644 package/libglib2/libglib2-0002-no-gtk-doc.patch

package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted +0 ~~-56~~

deleted file mode 100644
index 9b87d9d..0000000
@@ -1,56 +0,0 @@
-From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <[email protected]>
-Date: Wed, 25 Sep 2013 19:22:26 +1000
-Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
-
-Upstream-Status: Backport
-
----
- gio/gdbusmessage.c | 8 ++++----
- gio/gdbusprivate.c | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index ac233a3..ad77aa6 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
-                                           statbuf.st_mode);
-                   g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-                                           (guint64) statbuf.st_ino);
--                  g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_uid);
--                  g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_gid);
-+                  g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_uid);
-+                  g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_gid);
-                   g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
-                                           major (statbuf.st_rdev), minor (statbuf.st_rdev));
-                   g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 0e5bef2..785a0c0 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
-   _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
-            bytes_written,
-            g_dbus_message_get_serial (data->message),
-@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
-     _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
-            bytes_read,
-            serial,
--- 
-1.8.3.1
-

package/libglib2/libglib2-0002-no-gtk-doc.patch new file +0 -0

new file mode 100644
index 0000000..0c12ee4

Patches inside Buildroot should also contain a description, sob line, and Upstream-status (for example: backported, submitted, accepted, ..., each time referring to the relevant url.

Best regards,
Thomas

Hadrien Boutteville

author

2014-06-19 15:02 UTC #3 lore raw

PATCH 1/3 libglib2: bump to version 2.40.0

Hi Thomas,

Quoted 73 lines · Thomas De Schampheleire

Hadrien Boutteville <[email protected]> schreef:

Quoted 72 lines

Signed-off-by Hadrien Boutteville <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

---

...ror-format-string-errors-from-mismatched-.patch | 56 ----------------------
package/libglib2/libglib2-0002-no-gtk-doc.patch    | 11 +++++
package/libglib2/libglib2.mk                       |  4 +-
3 files changed, 13 insertions(+), 58 deletions(-)

delete mode 100644 package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch create mode 100644 package/libglib2/libglib2-0002-no-gtk-doc.patch

package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted +0 ~~-55~~

deleted file mode 100644
index 9b87d9d..0000000
@@ -1,56 +0,0 @@
-From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <[email protected]>
-Date: Wed, 25 Sep 2013 19:22:26 +1000
-Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
-
-Upstream-Status: Backport
-
----
- gio/gdbusmessage.c | 8 ++++----
- gio/gdbusprivate.c | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index ac233a3..ad77aa6 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
-                                           statbuf.st_mode);
-                   g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-                                           (guint64) statbuf.st_ino);
--                  g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_uid);
--                  g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
--                                          statbuf.st_gid);
-+                  g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_uid);
-+                  g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
-+                                          (guint) statbuf.st_gid);
-                   g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
-                                           major (statbuf.st_rdev), minor (statbuf.st_rdev));
-                   g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 0e5bef2..785a0c0 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
-   _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
-            bytes_written,
-            g_dbus_message_get_serial (data->message),
-@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
-     _g_dbus_debug_print_lock ();
-   g_print ("========================================================================\n"
-            "GDBus-debug:Transport:\n"
--           "  <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+           "  <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
-            "       size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
-            bytes_read,
-            serial,
--- 
-1.8.3.1

Quoted 8 lines

package/libglib2/libglib2-0002-no-gtk-doc.patch
Quoted 6 lines
package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted +0 -1
-
package/libglib2/libglib2-0002-no-gtk-doc.patch new file +0 -0
new file mode 100644
index 0000000..0c12ee4
Patches inside Buildroot should also contain a description, sob line, and Upstream-status (for example: backported, submitted, accepted, ..., each time referring to the relevant url.

Ok, I will add that. I think these patches are however not meant for upstream, as they are adaptations for Buildroot or minimal build.

Thanks for the review!

Best regards,

Hadrien

Hadrien Boutteville

author

2014-06-18 16:19 UTC #4 lore raw

PATCH 2/3 pango: bump to version 1.36.3

In reply to Hadrien Boutteville

Note: HarfBuzz is needed to build Pango. Configure does not return an error if HarfBuzz is missing, but without HarfBuzz it can't enable any backends.

Signed-off-by Hadrien Boutteville <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

---
 package/pango/Config.in                   |   1 +
 package/pango/pango-0001-no-tests.patch   |  21 ++
 package/pango/pango-0002-no-gtk-doc.patch |  11 +
 package/pango/pango-no-const-return.patch | 475 ------------------------------
 package/pango/pango-no-tests.patch        |  22 --
 package/pango/pango.mk                    |  19 +-
 6 files changed, 43 insertions(+), 506 deletions(-)
 create mode 100644 package/pango/pango-0001-no-tests.patch
 create mode 100644 package/pango/pango-0002-no-gtk-doc.patch
 delete mode 100644 package/pango/pango-no-const-return.patch
 delete mode 100644 package/pango/pango-no-tests.patch

package/pango/Config.in +1 -0

index 774682d..70f4fd3 100644
@@ -9,6 +9,7 @@ config BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_HARFBUZZ
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	help

package/pango/pango-0001-no-tests.patch new file +21 -0

new file mode 100644
index 0000000..324fd52
@@ -0,0 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango modules pango-view examples docs tools tests build
++SUBDIRS= pango modules pango-view examples docs tools build
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -418,7 +418,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pango modules pango-view examples docs tools tests build
++SUBDIRS = pango modules pango-view examples docs tools build
+ EXTRA_DIST = \
+ 	autogen.sh		\
+ 	pango.pc.in		\

package/pango/pango-0002-no-gtk-doc.patch new file +11 -0

new file mode 100644
index 0000000..0c12ee4
@@ -0,0 +1,11 @@
+--- 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:

package/pango/pango-no-const-return.patch deleted +0 ~~-475~~

475 lines not on this page · raw message

package/pango/pango-no-tests.patch deleted +0 ~~-22~~

deleted file mode 100644
index 7ebcbc6..0000000
@@ -1,22 +0,0 @@
---- a/Makefile.in	2008-01-21 22:28:49.000000000 -0500
-+++ b/Makefile.in	2008-02-09 13:02:41.000000000 -0500
-@@ -260,7 +260,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pango modules pango-view examples docs tools tests
-+SUBDIRS = pango modules pango-view examples docs tools 
- EXTRA_DIST = \
- 	autogen.sh		\
- 	pango.pc.in		\
-
---- a/Makefile.am	2008-01-17 16:37:49.000000000 -0500
-+++ b/Makefile.am	2008-02-09 13:35:13.000000000 -0500
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango modules pango-view examples docs tools tests
-+SUBDIRS= pango modules pango-view examples docs tools 
- 
- EXTRA_DIST = 			\
- 	autogen.sh		\

package/pango/pango.mk +10 -9

index 31d92ba..45361d9 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PANGO_VERSION_MAJOR = 1.28
-PANGO_VERSION = $(PANGO_VERSION_MAJOR).4
+PANGO_VERSION_MAJOR = 1.36
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).3
 
-PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
+PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_AUTORECONF = YES
 PANGO_INSTALL_STAGING = YES

@@ -39,26 +39,27 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 
-PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
+PANGO_CONF_OPT = --enable-explicit-deps=no \
+	--disable-debug \
+	--disable-gtk-doc-html
 
 PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	host-pkgconf \
 	libglib2 \
 	cairo \
+	harfbuzz \
 	fontconfig \
 	freetype
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-        PANGO_CONF_OPT += --with-x \
-		--x-includes=$(STAGING_DIR)/usr/include/X11 \
-		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
+	PANGO_CONF_OPT += --x-includes=$(STAGING_DIR)/usr/include/X11 \
+		--x-libraries=$(STAGING_DIR)/usr/lib
 	PANGO_DEPENDENCIES += xlib_libX11
-else
-        PANGO_CONF_OPT += --without-x
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
 	PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender
+	PANGO_CONF_OPT += --with-xft
 endif
 
 define PANGO_INSTALL_INITSCRIPT

Signature · 1 line

2.0.0

Thomas De Schampheleire

2014-06-18 20:10 UTC #5 lore raw

PATCH 2/3 pango: bump to version 1.36.3

Hadrien Boutteville <[email protected]> schreef:

Quoted 15 lines

Note: HarfBuzz is needed to build Pango. Configure does not return an error if HarfBuzz is missing, but without HarfBuzz it can't enable any backends.
Signed-off-by Hadrien Boutteville <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc "Yann E. MORIN" <[email protected]>
---
package/pango/Config.in                   |   1 +
package/pango/pango-0001-no-tests.patch   |  21 ++
package/pango/pango-0002-no-gtk-doc.patch |  11 +
package/pango/pango-no-const-return.patch | 475 ------------------------------
package/pango/pango-no-tests.patch        |  22 --
package/pango/pango.mk                    |  19 +-
6 files changed, 43 insertions(+), 506 deletions(-)

Quoted 4 lines

create mode 100644 package/pango/pango-0001-no-tests.patch create mode 100644 package/pango/pango-0002-no-gtk-doc.patch delete mode 100644 package/pango/pango-no-const-return.patch delete mode 100644 package/pango/pango-no-tests.patch

Same comment about header in newly added patches...

Best regards,
Thomas

Hadrien Boutteville

author

2014-06-18 16:19 UTC #6 lore raw

PATCH 3/3 cairo: add freetype dependency for freetype support

In reply to Hadrien Boutteville

Signed-off-by Hadrien Boutteville <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

---
 package/cairo/cairo.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/cairo/cairo.mk +7 -0

index 789dfa7..263e0e9 100644
@@ -55,6 +55,13 @@ else
 	CAIRO_CONF_OPT += --disable-directfb
 endif
 
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+	CAIRO_CONF_OPT += --enable-ft
+	CAIRO_DEPENDENCIES += freetype
+else
+	CAIRO_CONF_OPT += --disable-ft
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 	CAIRO_CONF_OPT += --enable-glesv2
 	CAIRO_DEPENDENCIES += libgles

Signature · 1 line

2.0.0

Eric Le Bihan

2014-06-19 08:02 UTC #7 lore raw

cover Bump packages before adding libgtk3

In reply to Hadrien Boutteville

Hi!

Quoted 8 lines · Hadrien Boutteville

Hello all,
I'm currently packaging libgtk3 (work in progress, patch soon), and this series bumps pango and libglib2 as it is necessary for libgtk3, and add Freetype support to Cairo.
This series is juste compiled-tested, so it's mostly an RFC. I will do running tests with libgtk3 and libgtk2.

I also have a WIP packaging for libgtk3 [1], but I have not sent the patch because libgtk3 depends on at-spi2-core. This package performs some non-cross-compilable checks in its configure script via this m4 macro, defined in acinclude.m4:

DBIND_CHECK_ALIGNOF(dbus_bool_t)

It fails when cross-compiling because it relies on AC_TRY_RUN() [2].

The only (ugly) solution I found was hardcoding some values depending on the architecture [3]:

  ifeq ($(BR2_i386), y)
  AT_SPI2_CORE_CONF_ENV = ac_cv_alignof_char=1 \
  	ac_cv_alignof_double=4 \
  	ac_cv_alignof_dbind_pointer=4 \
  	ac_cv_alignof_dbind_struct=1 \
  	ac_cv_alignof_dbus_bool_t=4 \
  	ac_cv_alignof_dbus_int16_t=2 \
  	ac_cv_alignof_dbus_int32_t=4 \
  	ac_cv_alignof_dbus_int64_t=4
  endif

How do you deal with this problem?

Best regards,
ELB

[1] https://github.com/elebihan/buildroot/tree/libgtk3-support
[2] https://www.sourceware.org/autobook/autobook/autobook_269.html
[3] https://github.com/elebihan/buildroot/blob/libgtk3-support/package/at-spi2-core/at-spi2-core.mk

Thomas Petazzoni

2014-06-19 12:37 UTC #8 lore raw

cover Bump packages before adding libgtk3

Dear Eric Le Bihan,

Quoted 1 line · Eric Le Bihan

I also have a WIP packaging for libgtk3 [1]

Aah, ok. Then please sync with Hadrien on how to upstream this and avoid duplicated work.

Quoted 23 lines

, but I have not sent the
patch because libgtk3 depends on at-spi2-core. This package performs some non-cross-compilable checks in its configure script via this m4 macro, defined in acinclude.m4:
DBIND_CHECK_ALIGNOF(dbus_bool_t)
It fails when cross-compiling because it relies on AC_TRY_RUN() [2].
The only (ugly) solution I found was hardcoding some values depending on the architecture [3]:
  ifeq ($(BR2_i386), y)
  AT_SPI2_CORE_CONF_ENV = ac_cv_alignof_char=1 \
  	ac_cv_alignof_double=4 \
  	ac_cv_alignof_dbind_pointer=4 \
  	ac_cv_alignof_dbind_struct=1 \
  	ac_cv_alignof_dbus_bool_t=4 \
  	ac_cv_alignof_dbus_int16_t=2 \
  	ac_cv_alignof_dbus_int32_t=4 \
  	ac_cv_alignof_dbus_int64_t=4
  endif

Quoted 1 line

How do you deal with this problem?

AC_CHECK_ALIGNOF() ?

Thomas

Signature · 3 lines

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

Hadrien Boutteville

author

2014-06-19 15:44 UTC #9 lore raw

cover Bump packages before adding libgtk3

Hi Eric, Thomas,

Quoted 8 lines · Thomas Petazzoni

Dear Eric Le Bihan,
Quoted 1 line · Eric Le Bihan
I also have a WIP packaging for libgtk3 [1]
Aah, ok. Then please sync with Hadrien on how to upstream this and avoid duplicated work.

Great! I'm looking at your branch. You can find mine here:
https://github.com/Eksel/buildroot/tree/libgtk3
(warning, WIP, there are ugly commits and there will be some rebase soon ;-) ).

Apparently we did several things differently, like how to handle the host-libgtk3 build (I just adapted the patch from libgtk2).

Quoted 23 lines

Quoted 23 lines
, but I have not sent the
patch because libgtk3 depends on at-spi2-core. This package performs some non-cross-compilable checks in its configure script via this m4 macro, defined in acinclude.m4:
DBIND_CHECK_ALIGNOF(dbus_bool_t)
It fails when cross-compiling because it relies on AC_TRY_RUN() [2].
The only (ugly) solution I found was hardcoding some values depending on the architecture [3]:
  ifeq ($(BR2_i386), y)
  AT_SPI2_CORE_CONF_ENV = ac_cv_alignof_char=1 \
  	ac_cv_alignof_double=4 \
  	ac_cv_alignof_dbind_pointer=4 \
  	ac_cv_alignof_dbind_struct=1 \
  	ac_cv_alignof_dbus_bool_t=4 \
  	ac_cv_alignof_dbus_int16_t=2 \
  	ac_cv_alignof_dbus_int32_t=4 \
  	ac_cv_alignof_dbus_int64_t=4
  endif

Quoted 3 lines

Quoted 1 line
How do you deal with this problem?
AC_CHECK_ALIGNOF() ?

Well, I didn't find (yet) the at-spi2-core dependency, so I don't have this problem for now. I'm still resolving some configure errors. It's a bit weird, there is no references to at-spi2-* neither in the documentation nor in the configure.

Best regards,

Hadrien