All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libglib2: bump version to 2.76.4
@ 2023-07-26 17:19 Bernd Kuhls
  2023-07-28 20:15 ` Thomas Petazzoni via buildroot
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Bernd Kuhls @ 2023-07-26 17:19 UTC (permalink / raw)
  To: buildroot; +Cc: James Knight, Fabrice Fontaine

From: James Knight <james.d.knight@live.com>

- Drop `iconv` option since it was obsolete and dropped [1][2].
- Ensure `nls` is explicitly configured based on `BR2_SYSTEM_ENABLE_NLS`
   being set.
- Cleanup configuration and dependency options (ordering, having a
   common variable to share between host/target builds, adding more
   explicit assignment of options).
- Drop "0002-Fix-error-format-in-gio-gunixconnection.c-part-2" since
   upstream patch was applied in this release.

Fixes:
 - http://autobuild.buildroot.net/results/f8b0e6f818297ce6a0c68e6e9dccc1eb4666cb73/
 - http://autobuild.buildroot.net/results/aa8560b919732ee597b18c3e9b3315fa325ed489/

[1]: https://gitlab.gnome.org/GNOME/glib/-/commit/e71ecc8771a4f13bc6046438ab0845944831b9a6
[2]: https://gitlab.gnome.org/GNOME/glib/-/commit/24ec80cfb4522d9819dbf5fd117665fef20b6418

Signed-off-by: James Knight <james.d.knight@live.com>
[Bernd: bumped to 2.76.4, renumbered patch 0003 to 0002]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...rmat-in-gio-gunixconnection.c-part-2.patch | 93 -------------------
 ...ocumentation-generation-with-gtk_do.patch} |  0
 package/libglib2/libglib2.hash                |  4 +-
 package/libglib2/libglib2.mk                  | 44 ++++-----
 4 files changed, 25 insertions(+), 116 deletions(-)
 delete mode 100644 package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
 rename package/libglib2/{0003-meson-wrap-html-documentation-generation-with-gtk_do.patch => 0002-meson-wrap-html-documentation-generation-with-gtk_do.patch} (100%)

diff --git a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
deleted file mode 100644
index 6075bacb06..0000000000
--- a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 4ae8606b6f80f9764e1f0a82cea7e23c8af487ae Mon Sep 17 00:00:00 2001
-From: James Knight <james.d.knight@live.com>
-Date: Thu, 20 Apr 2023 23:41:32 -0400
-Subject: [PATCH] Fix error format in gio/gunixconnection.c (part 2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update a series of error messages to use `g_set_error_literal` instead
-of `g_set_error`. This should prevent `format-nonliteral` compiler
-issues when `-Werror` is configured:
-
-    ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’:
-    ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
-      183 |         nscm);
-          |         ^~~~
-    ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
-      217 |                    nfd);
-          |                    ^~~
-    ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’:
-    ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
-      601 |                        nscm);
-          |                        ^~~~
-
-This is similar to a previous change [1] made to `gunixconnection.c`.
-
-[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4
-
-Signed-off-by: James Knight <james.d.knight@live.com>
-Upstream: backport from upstream https://gitlab.gnome.org/GNOME/glib/-/commit/4ae8606b6f80f9764e1f0a82cea7e23c8af487ae
----
- gio/gunixconnection.c | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
-index b3f2b1c04b0abdf7136918585ae4cea8970a88bb..c012fcbfe00b69e9da609c7b626229db98e931ac 100644
---- a/gio/gunixconnection.c
-+++ b/gio/gunixconnection.c
-@@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection  *connection,
-     {
-       gint i;
- 
--      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--        ngettext("Expecting 1 control message, got %d",
--                 "Expecting 1 control message, got %d",
--                 nscm),
--        nscm);
-+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+                           ngettext ("Expecting 1 control message, got %d",
-+                                     "Expecting 1 control message, got %d",
-+                                     nscm));
- 
-       for (i = 0; i < nscm; i++)
-         g_object_unref (scms[i]);
-@@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection  *connection,
-     {
-       gint i;
- 
--      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   ngettext("Expecting one fd, but got %d\n",
--                            "Expecting one fd, but got %d\n",
--                            nfd),
--                   nfd);
-+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+                           ngettext ("Expecting one fd, but got %d\n",
-+                                     "Expecting one fd, but got %d\n",
-+                                     nfd));
- 
-       for (i = 0; i < nfd; i++)
-         close (fds[i]);
-@@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection      *connection,
-     {
-       if (nscm != 1)
-         {
--          g_set_error (error,
--                       G_IO_ERROR,
--                       G_IO_ERROR_FAILED,
--                       ngettext("Expecting 1 control message, got %d",
--                                "Expecting 1 control message, got %d",
--                                nscm),
--                       nscm);
-+          g_set_error_literal (error,
-+                               G_IO_ERROR,
-+                               G_IO_ERROR_FAILED,
-+                               ngettext ("Expecting 1 control message, got %d",
-+                                         "Expecting 1 control message, got %d",
-+                                         nscm));
-           goto out;
-         }
- 
--- 
-2.39.1.windows.1
-
diff --git a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch b/package/libglib2/0002-meson-wrap-html-documentation-generation-with-gtk_do.patch
similarity index 100%
rename from package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
rename to package/libglib2/0002-meson-wrap-html-documentation-generation-with-gtk_do.patch
diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
index 07ed7635a6..bd4406d791 100644
--- a/package/libglib2/libglib2.hash
+++ b/package/libglib2/libglib2.hash
@@ -1,4 +1,4 @@
-# https://download.gnome.org/sources/glib/2.76/glib-2.76.1.sha256sum
-sha256  43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f  glib-2.76.1.tar.xz
+# https://download.gnome.org/sources/glib/2.76/glib-2.76.4.sha256sum
+sha256  5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda  glib-2.76.4.tar.xz
 # License files, locally calculated
 sha256  fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb  COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index ecd7d5dbfe..aa38cf1644 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGLIB2_VERSION_MAJOR = 2.76
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPL-2.1+
@@ -22,19 +22,32 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
 LIBGLIB2_CFLAGS += -marm
 endif
 
-HOST_LIBGLIB2_CONF_OPTS = \
+LIBGLIB2_COMMON_CONF_OPTS = \
 	-Ddtrace=false \
 	-Dglib_debug=disabled \
+	-Dgtk_doc=false \
 	-Dlibelf=disabled \
-	-Dselinux=disabled \
+	-Dman=false \
+	-Dmultiarch=false \
+	-Doss_fuzz=disabled \
+	-Dsysprof=disabled \
 	-Dsystemtap=false \
-	-Dxattr=false \
-	-Dtests=false \
-	-Doss_fuzz=disabled
+	-Dtests=false
+
+HOST_LIBGLIB2_CONF_OPTS = \
+	$(LIBGLIB2_COMMON_CONF_OPTS) \
+	-Dnls=disabled \
+	-Dselinux=disabled \
+	-Dxattr=false
 
 LIBGLIB2_DEPENDENCIES = \
-	host-pkgconf host-libglib2 \
-	libffi pcre2 zlib $(TARGET_NLS_DEPENDENCIES)
+	host-pkgconf \
+	host-libglib2 \
+	libffi \
+	pcre2 \
+	zlib \
+	$(TARGET_NLS_DEPENDENCIES) \
+	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
 HOST_LIBGLIB2_DEPENDENCIES = \
 	host-gettext \
@@ -49,21 +62,15 @@ HOST_LIBGLIB2_DEPENDENCIES = \
 # ${libdir} would be prefixed by the sysroot by pkg-config, causing a
 # bogus installation path once combined with $(DESTDIR).
 LIBGLIB2_CONF_OPTS = \
-	-Dglib_debug=disabled \
-	-Dlibelf=disabled \
+	$(LIBGLIB2_COMMON_CONF_OPTS) \
 	-Dgio_module_dir=/usr/lib/gio/modules \
-	-Dtests=false \
-	-Doss_fuzz=disabled
+	-Dnls=$(if $(BR2_SYSTEM_ENABLE_NLS),enabled,disabled)
 
 LIBGLIB2_MESON_EXTRA_PROPERTIES = \
 	have_c99_vsnprintf=true \
 	have_c99_snprintf=true \
 	have_unix98_printf=true
 
-ifneq ($(BR2_ENABLE_LOCALE),y)
-LIBGLIB2_DEPENDENCIES += libiconv
-endif
-
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
 LIBGLIB2_DEPENDENCIES += elfutils
 endif
@@ -73,11 +80,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 LIBGLIB2_LDFLAGS += -latomic
 endif
 
-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPTS += -Diconv=external
-LIBGLIB2_DEPENDENCIES += libiconv
-endif
-
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 LIBGLIB2_CONF_OPTS += -Dselinux=enabled -Dxattr=true
 LIBGLIB2_DEPENDENCIES += libselinux
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-08-07 21:54 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-26 17:19 [Buildroot] [PATCH 1/1] package/libglib2: bump version to 2.76.4 Bernd Kuhls
2023-07-28 20:15 ` Thomas Petazzoni via buildroot
     [not found] ` <20230728221509.1127286e__5257.07515641756$1690575343$gmane$org@windsurf>
2023-07-30 10:54   ` Bernd Kuhls
2023-07-30 11:27     ` Thomas Petazzoni via buildroot
2023-07-30 12:09       ` Bernd Kuhls
2023-07-30 12:09         ` Bernd Kuhls
2023-08-07 21:54 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.