From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] glib: update to 2.72.0.
Date: Fri, 25 Mar 2022 22:07:57 +0100 [thread overview]
Message-ID: <20220325210757.0EsS8ib2vn4aYiEhP04JuLgubEq5XQmBco7CA60Dzqk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36281@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages glib-2.72
https://github.com/void-linux/void-packages/pull/36281
glib: update to 2.72.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (but I would like to give it a few days)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36281.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.72-36281.patch --]
[-- Type: text/x-diff, Size: 7774 bytes --]
From 710bffc27fd220841f8ccf47224e4c65e82a2ba9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 21:58:04 +0100
Subject: [PATCH] glib: update to 2.72.0.
---
.../glib/patches/disable-broken-tests.patch | 54 ++++++------
srcpkgs/glib/patches/fix-formatd.patch | 86 -------------------
srcpkgs/glib/template | 6 +-
3 files changed, 29 insertions(+), 117 deletions(-)
delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c6bb8d96fadf..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
- 'cancellable' : {},
- 'contexts' : {},
- 'contenttype' : {},
+@@ -56,7 +56,6 @@ gio_tests = {
+ # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
+ 'should_fail' : host_system == 'darwin',
+ },
- 'converter-stream' : {},
'credentials' : {},
- 'data-input-stream' : {},
- 'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
'network-monitor' : {},
'network-monitor-race' : {},
'permission' : {},
@@ -16,15 +16,15 @@
'power-profile-monitor' : {},
'proxy-test' : {},
'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
+@@ -174,7 +172,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
- 'file' : {},
'gdbus-peer' : {
'dependencies' : [libgdbus_example_objectmanager_dep],
- 'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+ 'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary2,
]
endif
@@ -32,6 +32,8 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
+- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+- 'should_fail' : host_system == 'darwin',
- },
- }
endif
@@ -39,29 +41,33 @@
foreach test_name, extra_args : gio_tests
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
- 'collate' : {},
+ 'completion' : {},
'cond' : {},
- 'convert' : {},
'cxx' : {
'source' : ['cxx.cpp'],
},
'dataset' : {},
-- 'date' : {},
+- 'date' : {
+- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+- 'should_fail' : host_system == 'darwin',
+- },
'dir' : {},
- 'environment' : {},
+ 'environment' : {
+ # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+ 'should_fail' : host_system == 'darwin',
+ },
- 'error' : {},
- 'fileutils' : {},
-- 'gdatetime' : {
-- 'suite' : ['slow'],
-- },
- 'guuid' : {},
- 'gvariant' : {
+- 'fileutils' : {},
+ 'gdatetime' : {
'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+ },
+@@ -65,7 +57,6 @@ glib_tests = {
'mutex' : {},
'node' : {},
'once' : {},
@@ -69,11 +75,3 @@
'option-argv0' : {},
'overflow' : {},
'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
- 'thread' : {},
- 'thread-pool' : {},
- 'timeout' : {},
-- 'timer' : {},
- 'tree' : {},
- 'utf8-performance' : {},
- 'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
-
- const guint16 * const g_ascii_table = ascii_table_data;
-
--#if defined (HAVE_NEWLOCALE) && \
-- defined (HAVE_USELOCALE) && \
-- defined (HAVE_STRTOD_L) && \
-- defined (HAVE_STRTOULL_L) && \
-- defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+ defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
-
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
- gchar **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
-
- g_return_val_if_fail (nptr != NULL, 0);
-
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar *buffer,
- #define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
-
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
-
- static guint64
- g_parse_long_long (const gchar *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar *nptr,
- }
- return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
-
- /**
- * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
- gchar **endptr,
- guint base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
- return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
- gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
- gchar **endptr,
- guint base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
- return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
- gboolean negative;
---
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..d301dadb8990 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.70.2
+version=2.72.0
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -15,9 +15,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
next prev parent reply other threads:[~2022-03-25 21:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 15:32 [PR PATCH] " paper42
2022-03-25 20:59 ` [PR PATCH] [Updated] " paper42
2022-03-25 21:07 ` paper42 [this message]
2022-03-26 18:12 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220325210757.0EsS8ib2vn4aYiEhP04JuLgubEq5XQmBco7CA60Dzqk@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).