From patchwork Wed Dec 19 16:58:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bogdan@nimblex.org X-Patchwork-Id: 207442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 779C72C0093 for ; Thu, 20 Dec 2012 03:06:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAD7010034B; Wed, 19 Dec 2012 16:06:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eLsvXJBFgoD1; Wed, 19 Dec 2012 16:05:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 37D49100192; Wed, 19 Dec 2012 16:05:56 +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 A1D4A8F75B for ; Wed, 19 Dec 2012 16:06:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 14A0780ADB for ; Wed, 19 Dec 2012 16:06:03 +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 Us9GdRygj5Dq for ; Wed, 19 Dec 2012 16:06:01 +0000 (UTC) X-Greylist: delayed 00:06:59 by SQLgrey-1.7.6 Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id 17BB180C10 for ; Wed, 19 Dec 2012 16:06:00 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id u54so1068372wey.27 for ; Wed, 19 Dec 2012 08:05:59 -0800 (PST) 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 :x-gm-message-state; bh=e8zdaSM/7s09qwas9boB61kF54qh9bm3uJjGx7ln3sw=; b=hzb2GqpbV4St/Qo6aTwrBXI3+IbWqlXEJ3Aveow3psTyIts7x4fOx3uu4NIAebmiu/ rTm7Yjh1A3VX6Ys1m2xzSk84pp9XPS8Dmq8iiv/1JhO35tdLwc9Wrwl3b7WBgk2ihwNF LJhQsd3CCYmiY+IckEwrt5vtekfNHmUbWKDWnwOnDaCjj4vZ8E7ThJv5r/eqocW9sv8y hmllyqOsPJvcD1QtuGo5b+f6ji+YlkGUneJ6hQTt42ffV4exTaEjYDGfpq46KJkKlj4h OFJ8QvnxWGhU8uURNP5P0mWrib07WY5TlzVHKI2ZOSswBwI/Be+xgyHJc6aov2S7I6Qd WcBw== X-Received: by 10.194.9.4 with SMTP id v4mr12427042wja.50.1355932740580; Wed, 19 Dec 2012 07:59:00 -0800 (PST) Received: from nimblex.erepublik.com (p5099deeb.dip0.t-ipconnect.de. [80.153.222.235]) by mx.google.com with ESMTPS id i2sm21124347wiw.3.2012.12.19.07.58.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Dec 2012 07:58:59 -0800 (PST) From: bogdan@nimblex.org To: buildroot@busybox.net Date: Wed, 19 Dec 2012 16:58:41 +0000 Message-Id: <1355936324-9585-1-git-send-email-bogdan@nimblex.org> X-Mailer: git-send-email 1.7.12.1 X-Gm-Message-State: ALoCoQka2RQp9XcL2Z5Wo6ruApqpH/76eFEdirJAdGmUDH4x2y9audC3fTYehc6RBZDlNc+hkbSj Subject: [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4 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 From: Sven Neumann Bump libglib2 to a newer stable version. There are a few changes to the configure options necessary in order to make it compile cleanly and work correctly. The patch has been tested on ARM and i486. Some things might have to be adjusted for other platforms. Signed-off-by: Sven Neumann --- ...b2-make-codegen-python2-python3-compliant.patch | 192 --------------------- ...glib2-xdgmime-return-early-for-empty-data.patch | 31 ++++ package/libglib2/libglib2.mk | 15 +- 3 files changed, 39 insertions(+), 199 deletions(-) delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch create mode 100644 package/libglib2/libglib2-xdgmime-return-early-for-empty-data.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-xdgmime-return-early-for-empty-data.patch b/package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch new file mode 100644 index 0000000..17fed92 --- /dev/null +++ b/package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch @@ -0,0 +1,31 @@ +From 9689286b990709414227030a13ac2f287fed5a9c Mon Sep 17 00:00:00 2001 +From: Sven Neumann +Date: Mon, 9 Jul 2012 12:13:48 +0200 +Subject: [PATCH] xdgmime: return early for empty data + +Add a check for the data length to xdg_mime_get_mime_type_for_data() +and return early for len == 0 instead of crashing later in +cache_magic_matchlet_compare(). + +Signed-off-by: Sven Neumann +--- + gio/xdgmime/xdgmime.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c +index 846be39..9e53500 100644 +--- a/gio/xdgmime/xdgmime.c ++++ b/gio/xdgmime/xdgmime.c +@@ -467,6 +467,9 @@ xdg_mime_get_mime_type_for_data (const void *data, + { + const char *mime_type; + ++ if (len == 0) ++ return XDG_MIME_TYPE_UNKNOWN; ++ + xdg_mime_init (); + + if (_caches) +-- +1.7.9.5 + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index c3e510b..b476200 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,8 +3,9 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.30 -LIBGLIB2_VERSION_MINOR = 3 + +LIBGLIB2_VERSION_MAJOR = 2.32 +LIBGLIB2_VERSION_MINOR = 4 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) @@ -13,6 +14,7 @@ LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install LIBGLIB2_CONF_ENV = \ + CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \ ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ glib_cv_uscore=no ac_cv_func_strtod=yes \ ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \ @@ -40,8 +42,10 @@ LIBGLIB2_CONF_ENV = \ ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ ac_use_included_regex=no gl_cv_c_restrict=no \ 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_posix_getgrgid_r=no \ + ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8 ac_cv_alignof_unsigned_long=4 \ + 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 @@ -54,9 +58,6 @@ endif HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ - --disable-dtrace \ - --disable-systemtap \ - --disable-gcov LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)