From patchwork Wed May 15 19:52:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 244164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id F30D82C0079 for ; Thu, 16 May 2013 05:55:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C1DB5A0301; Wed, 15 May 2013 19:55:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tuufgzh2EClR; Wed, 15 May 2013 19:54:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 37FAEA0302; Wed, 15 May 2013 19:53:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 783F28F76F for ; Wed, 15 May 2013 19:53:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 521C78D1C2 for ; Wed, 15 May 2013 19:53:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kCiblwG2t-UQ for ; Wed, 15 May 2013 19:53:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-oa0-f49.google.com (mail-oa0-f49.google.com [209.85.219.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2DF6E8D358 for ; Wed, 15 May 2013 19:53:04 +0000 (UTC) Received: by mail-oa0-f49.google.com with SMTP id k14so2757467oag.36 for ; Wed, 15 May 2013 12:53:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=PyhiMx08O9l1R586rkj+WmjYwDpCy+s4zI5fipMRwm0=; b=T7vOgDSSHLg/A06CSlrO+Y0SdTRgBXuPVoKnQbgz/bsqzeNYdL7Lesqs7EEHYI5tVB CNVesbq7EmhUsPaE9lmxOxb6ogCmyNOvXA1FaDXTtABXwwzLHnT9bH2dQZEXkNyVQC9J z2equbezQET3xa+rkKKMnKPwyKTgnX8HENxKXgDoO0ienBI3g4PhyBzv5kk0ket6Hd3J gvu1c6zHS9xyq/kTegbD/E0ua8wMp1KXrOglYDFmU318HVUdU23YxShmHJUg+kS1blJk EF+PsMOLC1uisk+btReUxBrPauqxB+WW5wGaMGy69gWR15kk/SpPJ0b/HEyb8JbrWenz 1DtA== X-Received: by 10.182.110.169 with SMTP id ib9mr17233325obb.13.1368647583854; Wed, 15 May 2013 12:53:03 -0700 (PDT) Received: from bourban.gateway.2wire.net (108-90-245-135.lightspeed.cicril.sbcglobal.net. [108.90.245.135]) by mx.google.com with ESMTPSA id jw8sm4204627obb.14.2013.05.15.12.53.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 May 2013 12:53:02 -0700 (PDT) From: Spenser Gilliland To: buildroot@busybox.net Date: Wed, 15 May 2013 14:52:45 -0500 Message-Id: <1368647575-14377-2-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1368647575-14377-1-git-send-email-spenser@gillilanding.com> References: <1368647575-14377-1-git-send-email-spenser@gillilanding.com> X-Gm-Message-State: ALoCoQnJQWnWzHVfuBScgy/97xprrfPxA7pbqgpPX6arXgaqM8dRBc1jIwCN220pQIRGqYpr+ZFb Subject: [Buildroot] [PATCH v5 01/11] libglib2: Bump libglib2 to 2.36.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch bumps libglib2 to version 2.36.1. Signed-off-by: Spenser Gilliland --- ...b2-make-codegen-python2-python3-compliant.patch | 192 -------------------- package/libglib2/libglib2-no-tests.patch | 117 ------------ package/libglib2/libglib2.mk | 10 +- 3 files changed, 6 insertions(+), 313 deletions(-) delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch delete mode 100644 package/libglib2/libglib2-no-tests.patch diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch deleted file mode 100644 index b483827..0000000 --- a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch +++ /dev/null @@ -1,192 +0,0 @@ -Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee - -This patch is already included upstream, from the glib-2.32.4 release. - -Signed-off-by: Samuel Martin ---- -From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001 -From: Simon Feltman -Date: Thu, 14 Jun 2012 06:20:17 +0000 -Subject: Updated codegen to work with python3. - -Most changes were just replacing usage of "has_key" with "in". -Also updated the sorting function which was simplified and -changed to a "key" function instead of "cmp" (which is no longer -supported in python3. Verified everything builds with -python 2.7 and 3. - -https://bugzilla.gnome.org/show_bug.cgi?id=678066 ---- -diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py -index 41ea8fa..bca3490 100644 ---- a/gio/gdbus-2.0/codegen/codegen.py -+++ b/gio/gdbus-2.0/codegen/codegen.py -@@ -304,11 +304,8 @@ class CodeGenerator: - # - # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5 - # for discussion -- keys = function_pointers.keys() -- if len(keys) > 0: -- keys.sort(cmp=utils.my_version_cmp) -- for key in keys: -- self.h.write('%s'%function_pointers[key]) -+ for key in sorted(function_pointers.keys(), key=utils.version_cmp_key): -+ self.h.write('%s'%function_pointers[key]) - - self.h.write('};\n') - self.h.write('\n') -@@ -1022,11 +1019,9 @@ class CodeGenerator: - value = '@get_%s: '%(p.name_lower) - value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen) - doc_bits[key] = value -- keys = doc_bits.keys() -- if len(keys) > 0: -- keys.sort(cmp=utils.my_version_cmp) -- for key in keys: -- self.c.write(' * %s\n'%doc_bits[key]) -+ for key in sorted(doc_bits.keys(), key=utils.version_cmp_key): -+ self.c.write(' * %s\n'%doc_bits[key]) -+ - self.c.write(self.docbook_gen.expand( - ' *\n' - ' * Virtual table for the D-Bus interface #%s.\n' -diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py -index 4ceef57..00581f1 100644 ---- a/gio/gdbus-2.0/codegen/codegen_docbook.py -+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py -@@ -259,14 +259,12 @@ class DocbookCodeGenerator: - self.expand_member_dict[key] = value - # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat - # is evaluated before #org.foo.Iface:Media ... -- self.expand_member_dict_keys = self.expand_member_dict.keys() -- self.expand_member_dict_keys.sort(reverse=True) -- self.expand_iface_dict_keys = self.expand_iface_dict.keys() -- self.expand_iface_dict_keys.sort(reverse=True) -+ self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True) -+ self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True) - - def generate(self): - for i in self.ifaces: -- self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w') -+ self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w') - self.out.write(''%()) - self.out.write('\n'%()) - self.out.write(' 0 and len(b[0]) > 0: -- va = distutils.version.LooseVersion(a[0]) -- vb = distutils.version.LooseVersion(b[0]) -- ret = va.__cmp__(vb) -- else: -- ret = cmp(a[0], b[0]) -- if ret != 0: -- return ret -- return cmp(a[1], b[1]) -+def version_cmp_key(key): -+ # If the 'since' version is empty put a 0 in its place as this will -+ # allow LooseVersion to work and will always compare lower. -+ v = key[0] if key[0] else '0' -+ return (distutils.version.LooseVersion(v), key[1]) --- -cgit v0.9.0.2 diff --git a/package/libglib2/libglib2-no-tests.patch b/package/libglib2/libglib2-no-tests.patch deleted file mode 100644 index 81b5af2..0000000 --- a/package/libglib2/libglib2-no-tests.patch +++ /dev/null @@ -1,117 +0,0 @@ -Add a --disable-tests option to the configure script - -Disabling the build of tests has two benefits: - * Prevents the build of a lot of code that doesn't build on noMMU - platforms. - * Reduces the build time. - -Signed-off-by: Thomas Petazzoni - -Index: libglib2-2.30.3/Makefile.am -=================================================================== ---- libglib2-2.30.3.orig/Makefile.am 2012-03-11 22:43:28.000000000 +0100 -+++ libglib2-2.30.3/Makefile.am 2013-03-09 17:32:01.000000000 +0100 -@@ -6,7 +6,11 @@ - - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} - --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs -+if BUILD_TESTS -+TEST_SUBDIR = tests -+endif -+ -+SUBDIRS = . m4macros glib gmodule gthread gobject gio $(TEST_SUBDIR) po docs - DIST_SUBDIRS = $(SUBDIRS) build - - bin_SCRIPTS = glib-gettextize -Index: libglib2-2.30.3/gio/Makefile.am -=================================================================== ---- libglib2-2.30.3.orig/gio/Makefile.am 2012-03-11 22:44:19.000000000 +0100 -+++ libglib2-2.30.3/gio/Makefile.am 2013-03-09 17:32:38.000000000 +0100 -@@ -282,7 +282,11 @@ - - endif - --SUBDIRS += tests -+if BUILD_TESTS -+TEST_SUBDIR = tests -+endif -+ -+SUBDIRS += $(TEST_SUBDIR) - - libgio_2_0_la_SOURCES = \ - gappinfo.c \ -Index: libglib2-2.30.3/configure.ac -=================================================================== ---- libglib2-2.30.3.orig/configure.ac 2013-03-09 17:30:55.000000000 +0100 -+++ libglib2-2.30.3/configure.ac 2013-03-09 17:37:27.000000000 +0100 -@@ -234,11 +234,18 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(tests, -+ [AC_HELP_STRING([--disable-tests], -+ [disable all tests])], -+ enable_tests=${enableval}, -+ enable_tests=yes) - - if test "x$enable_threads" != "xyes"; then - enable_threads=no - fi - -+AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests = xyes]) -+ - AC_MSG_CHECKING([whether to enable garbage collector friendliness]) - if test "x$enable_gc_friendly" = "xyes"; then - AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default]) -Index: libglib2-2.30.3/glib/Makefile.am -=================================================================== ---- libglib2-2.30.3.orig/glib/Makefile.am 2012-03-11 22:43:28.000000000 +0100 -+++ libglib2-2.30.3/glib/Makefile.am 2013-03-09 18:02:59.000000000 +0100 -@@ -42,7 +42,11 @@ - gregex_h = - endif - --SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests -+if BUILD_TESTS -+TEST_SUBDIR = tests -+endif -+ -+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(TEST_SUBDIR) - - DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests - -Index: libglib2-2.30.3/gobject/Makefile.am -=================================================================== ---- libglib2-2.30.3.orig/gobject/Makefile.am 2012-03-11 22:43:29.000000000 +0100 -+++ libglib2-2.30.3/gobject/Makefile.am 2013-03-09 18:03:40.000000000 +0100 -@@ -4,7 +4,11 @@ - ## Process this file with automake to produce Makefile.in - include $(top_srcdir)/Makefile.decl - --SUBDIRS = . tests -+if BUILD_TESTS -+TEST_SUBDIR = tests -+endif -+ -+SUBDIRS = . $(TEST_SUBDIR) - - BUILT_SOURCES= - CLEANFILES= -Index: libglib2-2.30.3/gthread/Makefile.am -=================================================================== ---- libglib2-2.30.3.orig/gthread/Makefile.am 2012-03-11 22:43:29.000000000 +0100 -+++ libglib2-2.30.3/gthread/Makefile.am 2013-03-09 18:04:16.000000000 +0100 -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - include $(top_srcdir)/Makefile.decl - --SUBDIRS = . tests -+if BUILD_TESTS -+TEST_SUBDIR = tests -+endif -+ -+SUBDIRS = . $(TEST_SUBDIR) - DIST_SUBDIRS = tests - - AM_CPPFLAGS = \ diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d78e8ec..ee9f470 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,8 +3,8 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.30 -LIBGLIB2_VERSION_MINOR = 3 +LIBGLIB2_VERSION_MAJOR = 2.36 +LIBGLIB2_VERSION_MINOR = 1 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) @@ -44,6 +44,8 @@ LIBGLIB2_CONF_ENV = \ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \ ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \ + ac_cv_func_newlocale=no ac_cv_func_uselocale=no \ + ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no ac_cv_func_strtoull_l=no \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) # old uClibc versions don't provide qsort_r @@ -64,9 +66,9 @@ HOST_LIBGLIB2_CONF_OPT = \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \ - --disable-tests + --disable-modular-tests -LIBGLIB2_CONF_OPT += --disable-tests +LIBGLIB2_CONF_OPT += --disable-modular-tests LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext