[rpms/nautilus] rawhide: Backport upstream fix for g_set_date_time() conflict with glib

[rpms/nautilus] rawhide: Backport upstream fix for g_set_date_time() conflict with glib

[Jan Grulich]

A new commit has been pushed.

Repo   : rpms/nautilus
Branch : rawhide
Commit : 0b6d5d32a8af3fdef1e3330bd29647a3ad9826d2
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2026-07-31T07:42:54+02:00
Stats  : +43/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/nautilus/c/0b6d5d32a8af3fdef1e3330bd29647a3ad9826d2?branch=rawhide

Log:
Backport upstream fix for g_set_date_time() conflict with glib

---
diff --git a/nautilus-put-g_set_date_time-behind-guard.patch b/nautilus-put-g_set_date_time-behind-guard.patch
new file mode 100644
index 0000000..6749a6d
--- /dev/null
+++ b/nautilus-put-g_set_date_time-behind-guard.patch
@@ -0,0 +1,41 @@
+From b0ce3692801ab940755449b20ec60a6821ca4793 Mon Sep 17 00:00:00 2001
+From: Maximiliano Sandoval <msandova@gnome.org>
+Date: Mon, 27 Jul 2026 22:47:44 +0200
+Subject: [PATCH] date-util: Put g_set_date_time behind a guard
+
+Otherwise the glib's version, introduced at
+https://gitlab.gnome.org/GNOME/glib/-/commit/bb63c1ee368305363c0a168090774ef6a9b5cdbe,
+will get redefined.
+---
+ src/nautilus-date-utilities.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/nautilus-date-utilities.h b/src/nautilus-date-utilities.h
+index c056d877a2..60a2fbecda 100644
+--- a/src/nautilus-date-utilities.h
++++ b/src/nautilus-date-utilities.h
+@@ -24,8 +24,9 @@ char *
+ nautilus_date_preview_detailed_format (GDateTime *timestamp,
+                                        gboolean   use_detailed);
+ 
+-/* These are meant to be upstreamed to GLib, but live in-tree for now */
+-
++/* TODO Upstreamed to GLib in 2.89.3. Remove once the minimum required glib
++   version is higher. */
++#if !GLIB_CHECK_VERSION (2, 89, 3)
+ /**
+  * g_set_date_time: (skip)
+  * @date_time_pointer: (inout) (not optional) (nullable): a pointer to either
+@@ -74,6 +75,9 @@ g_set_date_time (GDateTime **date_time_pointer,
+ 
+     return TRUE;
+ }
++#endif
++
++/* This is meant to be upstreamed to GLib, but live in-tree for now */
+ 
+ /**
+  * g_set_ptr_array: (skip)
+-- 
+GitLab
+

diff --git a/nautilus.spec b/nautilus.spec
index 9ef456c..71f88c0 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -19,6 +19,8 @@ Source0:        https://download.gnome.org/sources/%{name}/%{gnome_major_version
 
 # https://pagure.io/fedora-workstation/issue/442
 Patch:          default-terminal.patch
+# https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/2074
+Patch:          nautilus-put-g_set_date_time-behind-guard.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc