diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-10-28 12:34:36 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-11-03 15:25:46 +0000 |
| commit | f6a48c332aab6040662de079404cc5fecd425148 (patch) | |
| tree | 427fb49aeb7501d52ac49b30f3ce6df642e902b3 | |
| parent | 58cced600da614d34ebf11c6af64b76916be35c7 (diff) | |
| download | ports-f6a48c332aab6040662de079404cc5fecd425148.tar.gz ports-f6a48c332aab6040662de079404cc5fecd425148.zip | |
devel/glib20: update to 2.70.1
Changes: https://gitlab.gnome.org/GNOME/glib/-/blob/2.70.1/NEWS
PR: 259513
Approved by: tcberner
(cherry picked from commit 2de04cfcc58f938f67846485b9c0c171b3533a35)
| -rw-r--r-- | devel/glib20/Makefile | 5 | ||||
| -rw-r--r-- | devel/glib20/distinfo | 6 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_glib-unix.c | 63 |
3 files changed, 5 insertions, 69 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 6b6c5fd91646..1243add3a20b 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,8 +1,7 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> PORTNAME= glib -DISTVERSION= 2.70.0 -PORTREVISION= 1 +DISTVERSION= 2.70.1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -34,7 +33,7 @@ BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even CPE_VENDOR= gnome -_LIBVERSION= 0.7000.0 +_LIBVERSION= 0.7000.1 PLIST_SUB= LIBVERSION=${_LIBVERSION} OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 4b649f9977f0..527ab760974d 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631873876 -SHA256 (gnome/glib-2.70.0.tar.xz) = 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 -SIZE (gnome/glib-2.70.0.tar.xz) = 4796812 +TIMESTAMP = 1635424476 +SHA256 (gnome/glib-2.70.1.tar.xz) = f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0 +SIZE (gnome/glib-2.70.1.tar.xz) = 4797752 diff --git a/devel/glib20/files/patch-glib_glib-unix.c b/devel/glib20/files/patch-glib_glib-unix.c deleted file mode 100644 index 1160e0cf537f..000000000000 --- a/devel/glib20/files/patch-glib_glib-unix.c +++ /dev/null @@ -1,63 +0,0 @@ ---- glib/glib-unix.c.orig 2021-09-17 10:17:56 UTC -+++ glib/glib-unix.c -@@ -463,7 +463,6 @@ g_unix_get_passwd_entry (const gchar *user_name, - } *buffer = NULL; - gsize string_buffer_size = 0; - GError *local_error = NULL; -- int errsv = 0; - - g_return_val_if_fail (user_name != NULL, NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); -@@ -493,10 +492,8 @@ g_unix_get_passwd_entry (const gchar *user_name, - */ - buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6); - -- errno = 0; - retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer, - string_buffer_size, &passwd_file_entry); -- errsv = errno; - - /* Bail out if: the lookup was successful, or if the user id can't be - * found (should be pretty rare case actually), or if the buffer should be -@@ -508,19 +505,19 @@ g_unix_get_passwd_entry (const gchar *user_name, - break; - } - else if (retval == 0 || -- errsv == ENOENT || errsv == ESRCH || -- errsv == EBADF || errsv == EPERM) -+ retval == ENOENT || retval == ESRCH || -+ retval == EBADF || retval == EPERM) - { - /* Username not found. */ -- g_unix_set_error_from_errno (&local_error, errsv); -+ g_unix_set_error_from_errno (&local_error, retval); - break; - } -- else if (errsv == ERANGE) -+ else if (retval == ERANGE) - { - /* Can’t allocate enough string buffer space. */ - if (string_buffer_size > 32 * 1024) - { -- g_unix_set_error_from_errno (&local_error, errsv); -+ g_unix_set_error_from_errno (&local_error, retval); - break; - } - -@@ -529,7 +526,7 @@ g_unix_get_passwd_entry (const gchar *user_name, - } - else - { -- g_unix_set_error_from_errno (&local_error, errsv); -+ g_unix_set_error_from_errno (&local_error, retval); - break; - } - } -@@ -543,7 +540,6 @@ g_unix_get_passwd_entry (const gchar *user_name, - { - g_clear_pointer (&buffer, g_free); - g_propagate_error (error, g_steal_pointer (&local_error)); -- errno = errsv; - } - - return (struct passwd *) g_steal_pointer (&buffer); |