From 31ba25663a5af0a31cd21320df6c95b2441ea3fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:19 +0900 Subject: [PATCH 1/9] Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory --- ...egfault-with-tab-pointing-to-invalid.patch | 52 +++++++++++++++++++ gnome-commander.spec | 8 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch new file mode 100644 index 0000000..583cf29 --- /dev/null +++ b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch @@ -0,0 +1,52 @@ +From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 +From: gnome-commander Fedora maintainer + +Date: Tue, 23 Jul 2024 15:14:27 +0900 +Subject: [PATCH] Workaround for segfault with tab pointing to invalid + directory + +Workaround for +https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 +--- + src/gnome-cmd-main-win.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc +index 9eec172c..c1cc2dd2 100644 +--- a/src/gnome-cmd-main-win.cc ++++ b/src/gnome-cmd-main-win.cc +@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) + + void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { +- if (gnome_cmd_data.tabs[id].empty()) ++ if (1 || gnome_cmd_data.tabs[id].empty()) + gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); + + auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); ++ auto back_tab = gnome_cmd_data.tabs[id].end(); ++ --back_tab; ++ auto found_valid = false; + + for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) + { +@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + gchar *path = nullptr; + GnomeCmdCon *con; + ++ if ((tab == back_tab) && found_valid) continue; ++ + if (!uriScheme) + { + g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); +@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { + const auto& tabTuple = tab->second; + fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); ++ found_valid = true; + } + else + { +-- +2.45.2 + diff --git a/gnome-commander.spec b/gnome-commander.spec index a4f0545..60abbfe 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,6 +72,7 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -189,6 +190,7 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -302,6 +304,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +- Apply upstream PR for workaround for segfault with leaving tab pointing to + invalid directory + * Mon Jul 22 2024 Mamoru TASAKA - 4:1.18.0-1 - 0.18.0 From 048e8fbb964f3dbddf4ddea4f3d67662f5f563e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:30 +0900 Subject: [PATCH 2/9] kill asan --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 60abbfe..d09f179 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,7 +10,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From 2af602367bf25d75a8698d87c9fe4815955531e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Aug 2024 13:53:44 +0900 Subject: [PATCH 3/9] 1.18.1 --- ...egfault-with-tab-pointing-to-invalid.patch | 52 ------------------- gnome-commander.spec | 11 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch deleted file mode 100644 index 583cf29..0000000 --- a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 -From: gnome-commander Fedora maintainer - -Date: Tue, 23 Jul 2024 15:14:27 +0900 -Subject: [PATCH] Workaround for segfault with tab pointing to invalid - directory - -Workaround for -https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 ---- - src/gnome-cmd-main-win.cc | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc -index 9eec172c..c1cc2dd2 100644 ---- a/src/gnome-cmd-main-win.cc -+++ b/src/gnome-cmd-main-win.cc -@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) - - void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { -- if (gnome_cmd_data.tabs[id].empty()) -+ if (1 || gnome_cmd_data.tabs[id].empty()) - gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); - - auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); -+ auto back_tab = gnome_cmd_data.tabs[id].end(); -+ --back_tab; -+ auto found_valid = false; - - for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) - { -@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - gchar *path = nullptr; - GnomeCmdCon *con; - -+ if ((tab == back_tab) && found_valid) continue; -+ - if (!uriScheme) - { - g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); -@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { - const auto& tabTuple = tab->second; - fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -+ found_valid = true; - } - else - { --- -2.45.2 - diff --git a/gnome-commander.spec b/gnome-commander.spec index d09f179..065c043 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,7 +72,6 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -190,7 +189,6 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -304,7 +302,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog -* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +* Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 +- 1.18.1 + +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2 - Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory diff --git a/sources b/sources index 7c549a8..4f65282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.0.tar.xz) = 327c2046da4b27360b8fd85e58e5315abc10bf2a19ccb0cb8b4d3150d8de479a94adeeafcf812a61c98c96e3eb0343a8979c1077c2a585881746d66f3884e4cb +SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e From 6ecc213f4733f49c1baa2847ea6134f1e8e17f10 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Sep 2024 16:23:29 +0900 Subject: [PATCH 4/9] Require gdk-pixbuf2-modules-extra when available --- gnome-commander.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 065c043..17c6b39 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -110,6 +110,9 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description GNOME Commander is a nice and fast file manager for the GNOME desktop. @@ -302,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 +- Require gdk-pixbuf2-modules-extra when available + * Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 - 1.18.1 From 33b6312d3ee8a599ca078c49dca7608033ae2625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:38:05 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 17c6b39..b1d3b69 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 3%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -305,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 - Require gdk-pixbuf2-modules-extra when available From 79ceb7d10e004b73e83d047115a546afccaed41e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Feb 2025 23:09:23 +0900 Subject: [PATCH 6/9] 1.18.2 --- gnome-commander.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b1d3b69..a247921 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.1 +%global fullver %{shortver}.2 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 3%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -111,6 +111,7 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy %if 0%{?fedora} >= 41 +BuildRequires: gdk-pixbuf2-modules-extra Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif @@ -305,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 +- 1.18.2 + * Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 4f65282..7a18b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e +SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 From e25944d21375571f2ea886c2bf8cff285ac81f83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Jun 2025 11:11:39 +0900 Subject: [PATCH 7/9] 1.18.3 --- gnome-commander.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a247921..51192eb 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.2 +%global fullver %{shortver}.3 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 +- 1.18.3 + * Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 - 1.18.2 diff --git a/sources b/sources index 7a18b69..8f12001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 +SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed From 3e1c033a50fdd94c5948e4e3136fa9635fe69bd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:40:17 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 51192eb..a75ce6e 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 - 1.18.3 From bbe02043e18341f0bec74108c85906cf8ed26cc2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Oct 2025 23:31:15 +0900 Subject: [PATCH 9/9] 1.18.4 --- gnome-commander.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a75ce6e..19979f7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.3 +%global fullver %{shortver}.4 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Oct 02 2025 Mamoru TASAKA - 4:1.18.4-1 +- 1.18.4 + * Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8f12001..d5cd8e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed +SHA512 (gnome-commander-1.18.4.tar.xz) = 54966719e63a4ca6c9d24cbd1f69dbadd4ac0b7588c2cd1a34635deafcab5976d9e82fdcf6dbc0dc7f1098a25443c9eeaa2400db192b487b6d92d62f62ee23db