From patchwork Fri Dec 7 17:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1009588 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y9dEKtFe"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43BKTB6bRPz9s3C for ; Sat, 8 Dec 2018 04:38:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C48A522E01; Fri, 7 Dec 2018 17:38:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GmAhW+23WYIg; Fri, 7 Dec 2018 17:38:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 56E8E228EF; Fri, 7 Dec 2018 17:38:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B9D141BF410 for ; Fri, 7 Dec 2018 17:38:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B067D828F2 for ; Fri, 7 Dec 2018 17:38:49 +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 pLOPQDUYcG6q for ; Fri, 7 Dec 2018 17:38:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id A5DB3825A6 for ; Fri, 7 Dec 2018 17:38:48 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id w73so2255695pfk.10 for ; Fri, 07 Dec 2018 09:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wvb3VrMWxi4lhaIPcfBVFQSPvuAIYHfAm/Ga0ac+OXg=; b=Y9dEKtFeAABnOi4J+sWvO3Dsfhzd/gUpRKAJkuabYkngrZhtNfHZD4vOZdjLXp7LKb Eema9WvoUOssFrWu60jL6AsQUynqQ/rjLdRYcVUTuTjJwALtH0pS/YbATd3TjCJFSm6C GRpvrvS8/6WhqkPFBjgABnPdtzNhGMewTrnrZFk2xTGpu0utMe9+AWQJrpqflQGzwz41 wzoOlzwpZLSjNbCcmL6WJEBzBg+bA6IAcH7qh4BguFcyS4P9YavWpUAcfiBjbWaUf7dX 4yuHFlELzNghYpcCAfImZ04t5K64TC0And0rO0PuMEYjtCrK2YuESZcRsDRXZ5Y+HVCH BS5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wvb3VrMWxi4lhaIPcfBVFQSPvuAIYHfAm/Ga0ac+OXg=; b=L9o2nl0jCuxMxytFLtVEnLVQoaiKYIIbd05wTol6xt1eWIXRauPjlrLjHy7LXKOxHa bcUnyGNQyrU/B1qco6ab+Mx3dVznL/H7gGTpUls9ZkKZGg1b3urGYjEWTEJPTlxYPhJK /g2QFP+qgyVtgitCcVuPd85dTJGBXjiekK+l4F1yWvOA1LDo2LtMgAguMO0Nol4t3L0y tlC61cyq5yBK+r40CfiRDqmUyYHJLpwHLfxB9wXlKLfj+OcILSgGG4JsGP/pcR3mCIvB PoO+jMm3IzZFlzy1iAvg2yz2yniNiLR4gNB5Y1YEoEyGSIX53aXutwoHXQRacS8dWgjh KM2w== X-Gm-Message-State: AA+aEWaFOBHyM1c/yANGvXHNCirEQM8cT1p/1AO2fewlC9Cabk0S+458 sg33YqaO8vwSzFkK8KHp1j3Q8up+ X-Google-Smtp-Source: AFSGD/XM1O2HQOc1Gq5bmkaz3166pPdByRdLeDM/PbCPJwDy2E2mgvaw6nsztOOrtEmv93jvHJGDdQ== X-Received: by 2002:a63:fa02:: with SMTP id y2mr2763327pgh.177.1544204327841; Fri, 07 Dec 2018 09:38:47 -0800 (PST) Received: from dell5510.suse.cz ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id z8sm7249786pgz.53.2018.12.07.09.38.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 09:38:46 -0800 (PST) From: Petr Vorel To: buildroot@buildroot.org Date: Fri, 7 Dec 2018 18:38:36 +0100 Message-Id: <20181207173836.13091-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] libglib2: Bump to version 2.56.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop 2 patches accepted by upstream. Signed-off-by: Petr Vorel --- ...gobject-fix-compilation-with-gcc-4.7.patch | 50 ------------------ ...compilation-without-F_-S-G-ETPIPE_SZ.patch | 52 ------------------- package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 2 +- 4 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch delete mode 100644 package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch diff --git a/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch b/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch deleted file mode 100644 index fc672513ee..0000000000 --- a/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a2b27c0d038ad76cc8016999f8788245da97e946 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 10 Apr 2018 19:18:57 +0200 -Subject: [PATCH] gobject: fix compilation with gcc <= 4.7 - -On gcc 4.7, we got the following error: - -i686-nptl-linux-gnu-gcc --version -> i686-nptl-linux-gnu-gcc (crosstool-NG 1.20.0) 4.7.4 -> $ echo '#include ' | i686-nptl-linux-gnu-gcc -x c -I -staging/usr/include/glib-2.0 -I staging/usr/lib/glib-2.0/include -Wall --Werror -c - -o /tmp/foo.o -> In file included from -staging/usr/include/glib-2.0/gobject/gbinding.h:29:0, -> from staging/usr/include/glib-2.0/glib-object.h:23, -> from :1: -> staging/usr/include/glib-2.0/gobject/gobject.h: In function -'g_set_object': -> staging/usr/include/glib-2.0/gobject/gobject.h:725:5: error: value -computed is not used [-Werror=unused-value] -> cc1: all warnings being treated as errors - -This error has been added by commit 3fae39a5d742afe73741f5fd7aa24e3ae8182f06 -So enable the new g_set_object definition only if gcc >= 4.8 - -Fixes: - - http://autobuild.buildroot.net/results/b29a2f868438a2210873ea72f491db63175848be - -Signed-off-by: Fabrice Fontaine -Upstream-status: https://bugzilla.gnome.org/show_bug.cgi?id=795138 ---- - gobject/gobject.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gobject/gobject.h b/gobject/gobject.h -index 9830663ce..838046fe0 100644 ---- a/gobject/gobject.h -+++ b/gobject/gobject.h -@@ -507,7 +507,7 @@ GLIB_AVAILABLE_IN_ALL - void g_object_remove_weak_pointer (GObject *object, - gpointer *weak_pointer_location); - --#if defined(__GNUC__) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56 -+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56 - /* Make reference APIs type safe with macros */ - #define g_object_ref(Obj) ((__typeof__(Obj)) (g_object_ref) (Obj)) - #define g_object_ref_sink(Obj) ((__typeof__(Obj)) (g_object_ref_sink) (Obj)) --- -2.14.1 - diff --git a/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch b/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch deleted file mode 100644 index 032f4851c4..0000000000 --- a/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0beb62f564072f3585762c9c55fe894485993b62 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 10 Apr 2018 18:55:11 +0200 -Subject: [PATCH] gio: fix compilation without F_{S,G}ETPIPE_SZ - -Commit a5778ef7c51044147fe470ea1707dd297f44f880 broke compilation on -architectures without F_SETPIPE_SZ and F_GETPIPE_SZ such as or1k. -If those variables are undefined, put back previous behavior, buffer -size set to 1024 * 64 - -Fixes: - - http://autobuild.buildroot.net/results/398490e07343a931b25ca6ab5c90a75d7a073e9f - -(Modified by Philip Withnall to add an -explanatory comment.) - -Signed-off-by: Fabrice Fontaine - -https://bugzilla.gnome.org/show_bug.cgi?id=795133 ---- - gio/gfile.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gio/gfile.c b/gio/gfile.c -index 334ad8ec3..a67aad383 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -3012,6 +3012,7 @@ splice_stream_with_progress (GInputStream *in, - if (!g_unix_open_pipe (buffer, FD_CLOEXEC, error)) - return FALSE; - -+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ) - /* Try a 1MiB buffer for improved throughput. If that fails, use the default - * pipe size. See: https://bugzilla.gnome.org/791457 */ - buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024); -@@ -3029,6 +3030,13 @@ splice_stream_with_progress (GInputStream *in, - goto out; - } - } -+#else -+ /* If #F_GETPIPE_SZ isn’t available, assume we’re on Linux < 2.6.35, -+ * but ≥ 2.6.11, meaning the pipe capacity is 64KiB. Ignore the possibility of -+ * running on Linux < 2.6.11 (where the capacity was the system page size, -+ * typically 4KiB) because it’s ancient. See pipe(7). */ -+ buffer_size = 1024 * 64; -+#endif - - g_assert (buffer_size > 0); - --- -2.13.0 - diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 7ce031aa89..57403a2154 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.56/glib-2.56.1.sha256sum -sha256 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d glib-2.56.1.tar.xz +# https://download.gnome.org/sources/glib/2.56/glib-2.56.3.sha256sum +sha256 a9a4c5b4c81b6c75bc140bdf5e32120ef3ce841b7413214ecf5f987acec74cb2 glib-2.56.3.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 67db5ac359..1029eaed65 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.56 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+