From b39abd4589597992b418f8b53e9b837054269c2c Mon Sep 17 00:00:00 2001 From: Hadrien Boutteville Date: Tue, 8 Jul 2014 15:57:04 +0200 Subject: [PATCH] libglib2: bump to version 2.40.0 Remove patch because it is applied upstream in this version. Signed-off-by: Hadrien Boutteville Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Cc: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...ormat-string-errors-from-mismatched-.patch | 56 ------------------- .../libglib2/libglib2-0002-no-gtk-doc.patch | 25 +++++++++ package/libglib2/libglib2.mk | 4 +- 3 files changed, 27 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 diff --git a/package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch b/package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted file mode 100644 index 9b87d9d547..0000000000 --- a/package/libglib2/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001 -From: Jan Schmidt -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 - diff --git a/package/libglib2/libglib2-0002-no-gtk-doc.patch b/package/libglib2/libglib2-0002-no-gtk-doc.patch new file mode 100644 index 0000000000..926a263f1b --- /dev/null +++ b/package/libglib2/libglib2-0002-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 +Signed-off-by: Hadrien Boutteville + +--- 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/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 122c6c9c74..396678d05a 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -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+ -- 2.30.2