Compare commits

...

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/xdg-user-dirs-gtk-0.11.tar.xz SOURCES/xdg-user-dirs-gtk-0.10.tar.xz

@ -1 +1 @@
4327e083be37370b18f44a54c3ff490839a7617c SOURCES/xdg-user-dirs-gtk-0.11.tar.xz 7af51ac84ca269377a9699482e43a03b87d4277c SOURCES/xdg-user-dirs-gtk-0.10.tar.xz

@ -0,0 +1,91 @@
From 9c19d7fedadf38cc4fec21efdb3908572448f658 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 30 May 2013 19:21:11 -0400
Subject: [PATCH] Make the 'Don't ask again' checkbox work properly
We used to remove the user-dirs.locale file when this is checked,
but that prevents xdg-user-dirs-gtk-update from ever running again.
Instead, update it with the current locale. This has the effect
of keeping xdg-user-dirs-gtk-update from running until the locale
changes again, which is probably closer to the intended effect.
https://bugzilla.redhat.com/show_bug.cgi?id=968955
---
update.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/update.c b/update.c
index 4697913..8710c79 100644
--- a/update.c
+++ b/update.c
@@ -48,12 +48,40 @@ has_xdg_translation (void)
if (strncmp (locale, "en_US", 5) == 0 ||
strcmp (locale, "C") == 0)
return TRUE;
-
+
str = "Desktop";
return dgettext ("xdg-user-dirs", str) != str;
}
static void
+save_locale (void)
+{
+ FILE *file;
+ char *user_locale_file;
+ char *locale, *dot;
+
+ user_locale_file = g_build_filename (g_get_user_config_dir (),
+ "user-dirs.locale", NULL);
+ file = fopen (user_locale_file, "w");
+ g_free (user_locale_file);
+
+ if (file == NULL)
+ {
+ fprintf (stderr, "Can't save user-dirs.locale\n");
+ return;
+ }
+
+ locale = g_strdup (setlocale (LC_MESSAGES, NULL));
+ /* Skip encoding part */
+ dot = strchr (locale, '.');
+ if (dot)
+ *dot = 0;
+ fprintf (file, "%s", locale);
+ g_free (locale);
+ fclose (file);
+}
+
+static void
update_locale (XdgDirEntry *old_entries)
{
XdgDirEntry *new_entries, *entry;
@@ -91,10 +119,9 @@ update_locale (XdgDirEntry *old_entries)
g_free (std_out);
g_free (std_err);
g_free (cmdline);
-
if (!WIFEXITED(exit_status) || WEXITSTATUS(exit_status) != 0)
return;
-
+
new_entries = parse_xdg_dirs (filename);
g_unlink (filename);
g_free (filename);
@@ -254,12 +281,7 @@ update_locale (XdgDirEntry *old_entries)
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)))
{
- char *file;
-
- file = g_build_filename (g_get_user_config_dir (),
- "user-dirs.locale", NULL);
- g_unlink (file);
- g_free (file);
+ save_locale ();
}
g_free (new_entries);
--
1.8.2.1

@ -1,21 +1,23 @@
Name: xdg-user-dirs-gtk Name: xdg-user-dirs-gtk
Version: 0.11 Version: 0.10
Release: 6%{?dist} Release: 22%{?dist}
Summary: Gnome integration of special directories Summary: Gnome integration of special directories
License: GPL-2.0-or-later License: GPL+
URL: https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
Source0: https://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.xz
Patch0: show-in-mate.patch # upstream fix
Patch0: 0001-Make-the-Don-t-ask-again-checkbox-work-properly.patch
BuildRequires: desktop-file-utils Patch1: show-in-mate.patch
BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gtk3-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: make
BuildRequires: xdg-user-dirs BuildRequires: xdg-user-dirs
BuildRequires: pkgconfig(gtk+-3.0)
Requires: xdg-user-dirs Requires: xdg-user-dirs
@ -25,7 +27,9 @@ desktop, including creating default bookmarks and detecting
locale changes. locale changes.
%prep %prep
%autosetup -p1 %setup -q
%patch0 -p1
%patch1 -p1
%build %build
%configure %configure
@ -41,43 +45,18 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/user-dirs-upda
%files -f %{name}.lang %files -f %{name}.lang
%doc NEWS AUTHORS README ChangeLog %doc NEWS AUTHORS README ChangeLog COPYING
%license COPYING
%{_bindir}/* %{_bindir}/*
%config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop %config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.11-6 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.10-22
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.11-5
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.11-5
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Dec 19 2022 David King <amigadave@amigadave.com> - 0.11-1
- Update to 0.11 (#2135328)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-21 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-20 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save