Accepting request 1060499 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1060499
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=262

1539540.patch

@@ -1,29 +0,0 @@
-From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Tue, 20 Dec 2022 17:10:41 -0600
-Subject: [PATCH] gthread-posix: need to #include <errno.h>
-
-a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
-header.
-
-
-(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
----
- glib/gthreadprivate.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
-index 6eaf422753..f34368a7c2 100644
---- a/glib/gthreadprivate.h
-+++ b/glib/gthreadprivate.h
-@@ -41,6 +41,7 @@ struct  _GRealThread
- /* system thread implementation (gthread-posix.c, gthread-win32.c) */
- 
- #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
-+#include <errno.h>
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
--- 
-GitLab
-

glib-2.74.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172
-size 5208484

glib-2.74.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ceba83a5999ceb31a4c4fc9921207cb9ffffd2ab1d6ec03c162d3f608a5c14c8
+size 5211852

glib2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 19 14:50:06 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.74.5:
+  + Bugs fixed: glgo#GNOME/GLib#2843, glgo#GNOME/GLib#2881,
+    glgo#GNOME/GLib#2883, glgo#GNOME/GLib!3165,
+    glgo#GNOME/GLib!3166, glgo#GNOME/GLib!3182,
+    glgo#GNOME/GLib!3197, glgo#GNOME/GLib!3204,
+    glgo#GNOME/GLib!3214.
+  + Updated translations.
+- Drop 1539540.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Dec 22 13:01:42 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 

glib2.spec

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
 %define libgthread libgthread-%{libver}
 %bcond_without     systemtap
 Name:           glib2%{psuffix}
-Version:        2.74.4
+Version:        2.74.5
 Release:        0
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1-or-later
@@ -58,8 +58,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 1539540.patch -- gthread-posix: need to #include <errno.h>
-Patch5:         https://gitlab.gnome.org/GNOME/glib/-/commit/1539540.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -263,7 +261,7 @@ the functionality of the installed glib2 package.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+
 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
 cp -a %{SOURCE4} gnome_defaults.conf
 # replace /usr/bin/env shebangs