diff --git a/.gitignore b/.gitignore index ce6b5fb..6ea208e 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ gedit-2.31.6.tar.bz2 /gedit-40.0.tar.xz /gedit-40.1.tar.xz /gedit-41.alpha.tar.xz +/gedit-41.0.tar.xz diff --git a/0001-open-selector-Fix-crash-introduced-in-GDateTime-port.patch b/0001-open-selector-Fix-crash-introduced-in-GDateTime-port.patch deleted file mode 100644 index 1ac2e0c..0000000 --- a/0001-open-selector-Fix-crash-introduced-in-GDateTime-port.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 624af5fed418c2be0939f42e75c4e9c4744d98d7 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 27 Sep 2021 15:07:52 -0400 -Subject: [PATCH] open-selector: Fix crash introduced in GDateTime port - -commit acf14cc04f1e66c4c726d9a0b193bf39a28ca8b0 moved FileItems -over to using GDateTime instead of GTimeVal. - -This reduced code complexity pretty nicely, but it unfortunately -introduced a bug, where the sort_items_by_mru function was treating -the FileItems themselves as GDateTime objects. That bug causes a -crash when opening files. - -This commit fixes the problem by using the ->accessed members -instead of the file items themselves. - -Closes: https://gitlab.gnome.org/GNOME/gedit/-/issues/465 ---- - gedit/gedit-open-document-selector.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c -index bc3d0548d..e46f01568 100644 ---- a/gedit/gedit-open-document-selector.c -+++ b/gedit/gedit-open-document-selector.c -@@ -285,61 +285,61 @@ create_row (GeditOpenDocumentSelector *selector, - filter_regex, - (const gchar *)item->path, - (const gchar *)item->name, - &dst_path, - &dst_name); - } - else - { - dst_path = g_markup_escape_text (item->path, -1); - dst_name = g_markup_escape_text (item->name, -1); - } - - gtk_list_store_append (selector->liststore, &iter); - gtk_list_store_set (selector->liststore, &iter, - URI_COLUMN, uri, - NAME_COLUMN, dst_name, - PATH_COLUMN, dst_path, - -1); - - g_free (dst_path); - g_free (dst_name); - } - - static gint - sort_items_by_mru (FileItem *a, - FileItem *b, - gpointer unused G_GNUC_UNUSED) - { - g_assert (a != NULL && b != NULL); - -- return g_date_time_compare (b, a); -+ return g_date_time_compare (b->accessed, a->accessed); - } - - static GList * - compute_all_items_list (GeditOpenDocumentSelector *selector) - { - GList *recent_items; - GList *home_dir_items; - GList *desktop_dir_items; - GList *local_bookmarks_dir_items; - GList *file_browser_root_items; - GList *active_doc_dir_items; - GList *current_docs_items; - GList *all_items = NULL; - - /* Copy/concat the whole list */ - recent_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->recent_items); - home_dir_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->home_dir_items); - desktop_dir_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->desktop_dir_items); - local_bookmarks_dir_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->local_bookmarks_dir_items); - file_browser_root_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->file_browser_root_items); - active_doc_dir_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->active_doc_dir_items); - current_docs_items = gedit_open_document_selector_copy_file_items_list ((const GList *)selector->current_docs_items); - - if (selector->all_items) - { - gedit_open_document_selector_free_file_items_list (selector->all_items); - selector->all_items = NULL; - } - - all_items = g_list_concat (all_items, recent_items); --- -2.32.0 - diff --git a/gedit.spec b/gedit.spec index d64a7c4..89b11be 100644 --- a/gedit.spec +++ b/gedit.spec @@ -8,14 +8,14 @@ # Filter provides for plugin .so files %global __provides_exclude_from ^%{_libdir}/gedit/plugins/ -%global apiver 41.alpha +%global apiver 41 %global tarball_version %%(echo %{version} | tr '~' '.') Name: gedit Epoch: 2 -Version: 41~alpha -Release: 3%{?dist} +Version: 41.0 +Release: 1%{?dist} Summary: Text editor for the GNOME desktop License: GPLv2+ and GFDL @@ -63,8 +63,6 @@ Requires: desktop-file-utils >= 0.22-6 Obsoletes: gedit-collaboration < 3.6.1-6 Obsoletes: gedit-plugin-zeitgeist < 3.35.90 -Patch10001: 0001-open-selector-Fix-crash-introduced-in-GDateTime-port.patch - %description gedit is a small, but powerful text editor designed specifically for @@ -107,7 +105,7 @@ Install gedit-devel if you want to write plugins for gedit. %find_lang %{name} --with-gnome %check -appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/org.gnome.gedit.appdata.xml +appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_metainfodir}/org.gnome.gedit.appdata.xml desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop %files -f %{name}.lang @@ -159,7 +157,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_datadir}/dbus-1/services/org.gnome.gedit.service %{_datadir}/icons/hicolor/*/apps/org.gnome.gedit.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg -%{_datadir}/metainfo/org.gnome.gedit.appdata.xml +%{_metainfodir}/org.gnome.gedit.appdata.xml %files devel %{_includedir}/gedit-%{apiver}/ @@ -168,6 +166,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_datadir}/vala/ %changelog +* Mon Feb 14 2022 David King - 2:41.0-1 +- Update to 41.0 + * Thu Jan 20 2022 Fedora Release Engineering - 2:41~alpha-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 99feac6..145d439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gedit-41.alpha.tar.xz) = 0cff4d01befe6a3a4130ee37875dec28bbfaffbe4806ad76c2ade89834b9c1c98f607c45f6e89b52854bf1c7b6d0024d49fdcbd9b9c97c85424572a527d39b3c +SHA512 (gedit-41.0.tar.xz) = 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e