diff --git a/63e7864.patch b/63e7864.patch deleted file mode 100644 index 211a8ac..0000000 --- a/63e7864.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Signed-off-by: Khem Raj ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 95f5b868e..a15fb1ca1 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -GitLab - diff --git a/glib2.changes b/glib2.changes index 68b3302..b616748 100644 --- a/glib2.changes +++ b/glib2.changes @@ -4,6 +4,7 @@ Fri Aug 20 16:20:21 UTC 2021 - Bjørn Lie - Update to version 2.68.4: + Various bugfixes and backports from master. + Updated translations. +- Drop 63e7864.patch: fixed upstream. ------------------------------------------------------------------- Wed Aug 4 15:17:41 UTC 2021 - Dominique Leuenberger diff --git a/glib2.spec b/glib2.spec index 19fd79e..68bc63e 100644 --- a/glib2.spec +++ b/glib2.spec @@ -47,8 +47,6 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen Patch4: glib2-gdbus-codegen-version.patch -# PATCH-FIX-UPSTREAM 63e7864.patch boo#1189088 dimstar@opensuse.org -- Fix build with glibc 2.34: use 3 parameters for close_range -Patch5: https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gamin-devel @@ -271,7 +269,6 @@ translation-update-upstream %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf # replace /usr/bin/env shebangs