Bump packages before adding libgtk3

PATCH Superseded Hadrien Boutteville 1 participant 5 messages Jun 19, 2014

lore

Share & tools

lore

Hadrien Boutteville

author

2014-06-19 21:27 UTC #0 lore raw

v2 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

---
Changes v1 -> v2:
- add comments to patches inside Buildroot (Thomas De S.)
---

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-19 21:27 UTC #1 lore raw

PATCH v2 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]>

---
Changes v1 -> v2:
- add comments to patches inside Buildroot (Thomas De S.)

---
 ...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

Hadrien Boutteville

author

2014-06-19 21:27 UTC #2 lore raw

PATCH v2 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]>

---
Changes v1 -> v2:
- add comments to patches inside Buildroot (Thomas De S.)

---
 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

Hadrien Boutteville

author

2014-06-19 21:27 UTC #3 lore raw

PATCH v2 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

Hadrien Boutteville

author

2014-06-19 21:33 UTC #4 lore raw

v2 cover Bump packages before adding libgtk3

In reply to Hadrien Boutteville

Hello all,

Quoted 32 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.
Regards,
Hadrien
---
Changes v1 -> v2:
- add comments to patches inside Buildroot (Thomas De S.)
---
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 -

Quoted 9 lines

 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

Please ignore this series, I messed up with my commits' hashes..

Resending.

Sorry,

Hadrien