From 7d557e246432c7d7d383a7d8428300cbbd1824bc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:00 +0100 Subject: [PATCH 01/45] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- pcmanfm.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 4294415..5f67dea 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -56,7 +56,6 @@ Version: %{mainver} Release: %{fedorarel}%{?dist} Summary: Extremly fast and lightweight file manager -Group: User Interface/Desktops License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ %if 0%{?use_git} >= 1 @@ -116,7 +115,6 @@ which features tabbed browsing and user-friendly interface. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel From 3543d21bf6c3132301b596d8c401a6250a7d87c8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:16:52 +0100 Subject: [PATCH 02/45] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- pcmanfm.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 5f67dea..cd1e344 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -207,14 +207,6 @@ cd .. %{_prefix}/lib/rpm/check-rpaths -%post -update-desktop-database &> /dev/null -exit 0 - -%postun -update-desktop-database &> /dev/null -exit 0 - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS From 79096ddae44865cb3cfdc2afdb5661f678e0a250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 18:07:40 +0000 Subject: [PATCH 03/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index cd1e344..483fa2f 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -53,7 +53,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -225,6 +225,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 10 2019 Mamoru TASAKA - 1.3.1-2.D20181227git0619a81f - Update to the latest git - fix isdigit() undefined behavior to fix Alt+Home issue [SF#1085] (may fix #1649027) From a6816e4d874776931156f72cca5d3b3e817b202d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 00:13:36 +0000 Subject: [PATCH 04/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 483fa2f..6cebbe3 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -53,7 +53,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -225,6 +225,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f00e7cdd6029731796fc4638c635d89e14a602c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 21:04:26 +0000 Subject: [PATCH 05/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 6cebbe3..8e8f7e7 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -53,7 +53,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -225,6 +225,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4b1c3e3004e996ea3192f1725d3b8a916c7c3ab5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 22 Mar 2020 20:00:05 +0900 Subject: [PATCH 06/45] main: set the GIOChannel encoding to binary (may fix 1797193) --- .gitignore | 1 + ...et-the-GIOChannel-encoding-to-binary.patch | 31 +++++++++++++++++++ pcmanfm.spec | 21 +++++++++---- sources | 2 +- 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch diff --git a/.gitignore b/.gitignore index bc91f05..5e4f2e3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ pcmanfm-0.9.7.tar.gz /pcmanfm-1.3.0.tar.xz /pcmanfm-1.3.1.tar.xz /pcmanfm-20190110T1400.tar.gz +/pcmanfm-20200322T1948.tar.gz diff --git a/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch b/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch new file mode 100644 index 0000000..7a2cd91 --- /dev/null +++ b/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch @@ -0,0 +1,31 @@ +From ec3c00ed4c5130fdc8a83b84b587da8457e067f1 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 22 Mar 2020 16:46:48 +0900 +Subject: [PATCH] main: set the GIOChannel encoding to binary + +https://developer.gnome.org/glib/stable/glib-IO-Channels.html#g-io-channel-set-encoding +says the default encoding is UTF-8, and setting encoding to NULL is safe +use with binary data. + +Actually without setting encoding to NULL, on Fedora 32, trying to terminate pcmanfm with +Ctrl-C (SIGINT) causes pcmanfm hang at g_io_channel_read_chars() in on_unix_signal(), +and this is now causing system reboot delayed for 90 seconds with systemd. +--- + src/pcmanfm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pcmanfm.c b/src/pcmanfm.c +index 9be80f7..c0fe84f 100644 +--- a/src/pcmanfm.c ++++ b/src/pcmanfm.c +@@ -239,6 +239,7 @@ int main(int argc, char** argv) + { + GIOChannel* ch = g_io_channel_unix_new(signal_pipe[0]); + g_io_add_watch(ch, G_IO_IN|G_IO_PRI, (GIOFunc)on_unix_signal, NULL); ++ g_io_channel_set_encoding(ch, NULL, NULL); + g_io_channel_unref(ch); + + /* intercept signals */ +-- +2.26.0.rc2 + diff --git a/pcmanfm.spec b/pcmanfm.spec index 8e8f7e7..64444fa 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -20,7 +20,7 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 2 +%global mainrel 3 %if 0%{?use_git} >= 1 %global githash fc8adaab77f2cc9120deaf905f732e6a7ec1a8a4 @@ -29,10 +29,10 @@ %global gitdate_num 20130830 %endif %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20190110 -%global gitbaretime 1400 -%global githeaddate 20181227 -%global git_rev 0619a81f358d85568d990fc78c67e121e55f1c05 +%global gitbaredate 20200322 +%global gitbaretime 1948 +%global githeaddate 20190224 +%global git_rev c52cc4b2c8975c30fc7dea6527111980a532d5e9 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{githeaddate}git%{git_short} %endif @@ -53,7 +53,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist} Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -81,6 +81,9 @@ Patch102: pcmanfm-0102-use-GList-for-FmDesktop-entries-instead-of-static-ar.patc Patch103: pcmanfm-0103-Fix-the-bug-that-desktop-configuration-is-not-proper.patch Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch +# main: set the GIOChannel encoding to binary +Patch201: pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch + BuildRequires: gcc BuildRequires: libfm-gtk-devel >= %{libfm_minver} BuildRequires: menu-cache-devel @@ -152,6 +155,8 @@ cat %PATCH102 | git am cat %PATCH103 | git am cat %PATCH104 | git am +cat %PATCH201 | git am + %if 0%{?use_git} || 0%{?use_gitbare} sh autogen.sh @@ -225,6 +230,10 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Mon Mar 22 2020 Mamoru TASAKA - 1.3.1-3.D20190224gitc52cc4b2 +- main: set the GIOChannel encoding to binary + (may fix 1797193) + * Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-2.D20181227git0619a81f.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ea98796..40074aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20190110T1400.tar.gz) = 885ece510e70c7a8217d729b49fd702cf462fd6cd914e7c7777fa20b2cc2cf70786d1eb5ee550b63cb9c0d691adde3704cc27e763dedda59d1cb674f7b0b273d +SHA512 (pcmanfm-20200322T1948.tar.gz) = 4827eda96ab87423af67f5c05db4d3f8bb556a044103e6f35350f10b45d4e9e93fd6e60d0830057f6495bdd40f7a6a27dc1274626142e155692e975cb50a3c69 From cc9d89759cad7932d00b66faf01efdcb3f33dc2a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 28 Mar 2020 16:32:35 +0900 Subject: [PATCH 07/45] add upstream link --- pcmanfm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pcmanfm.spec b/pcmanfm.spec index 64444fa..3f8f435 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -82,6 +82,7 @@ Patch103: pcmanfm-0103-Fix-the-bug-that-desktop-configuration-is-not-proper.patc Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch # main: set the GIOChannel encoding to binary +# https://sourceforge.net/p/pcmanfm/bugs/1109/ Patch201: pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch BuildRequires: gcc From d9f38aae080ddce589b14dc0413233456a00da0d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Apr 2020 14:28:02 +0900 Subject: [PATCH 08/45] Update to the latest git (the previous GIOChannel patch merged) --- .gitignore | 1 + pcmanfm.spec | 46 ++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 5e4f2e3..5c0c4b2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ pcmanfm-0.9.7.tar.gz /pcmanfm-1.3.1.tar.xz /pcmanfm-20190110T1400.tar.gz /pcmanfm-20200322T1948.tar.gz +/pcmanfm-20200408T1418.tar.gz diff --git a/pcmanfm.spec b/pcmanfm.spec index 3f8f435..838e7e4 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -3,15 +3,12 @@ %endif %global use_release 0 -%global use_git 0 %global use_gitbare 1 -%if 0%{?use_git} < 1 %if 0%{?use_gitbare} < 1 # force %global use_release 1 %endif -%endif %global mainver 1.3.1 %undefine prever @@ -20,26 +17,17 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 3 +%global mainrel 4 -%if 0%{?use_git} >= 1 -%global githash fc8adaab77f2cc9120deaf905f732e6a7ec1a8a4 -%global shorthash %(TMP=%githash ; echo ${TMP:0:10}) -%global gitdate Fri Aug 30 19:14:03 2013 +0300 -%global gitdate_num 20130830 -%endif %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20200322 -%global gitbaretime 1948 -%global githeaddate 20190224 -%global git_rev c52cc4b2c8975c30fc7dea6527111980a532d5e9 +%global gitbaredate 20200408 +%global gitbaretime 1418 +%global githeaddate 20200322 +%global git_rev be8c60d588fc6b527d1cc77df9935bcfa66d52be %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{githeaddate}git%{git_short} %endif -%if 0%{?use_git} >= 1 -%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash} -%endif %if 0%{?use_gitbare} >= 1 %global fedorarel %{mainrel}.%{git_version} %endif @@ -58,10 +46,7 @@ Summary: Extremly fast and lightweight file manager License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ -%if 0%{?use_git} >= 1 -Source0: %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz -%endif -%if 0%{?use_gitbare} +%if 0%{?use_gitbare} >= 1 Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz %endif %if 0%{?use_release} >= 1 @@ -83,7 +68,7 @@ Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch # main: set the GIOChannel encoding to binary # https://sourceforge.net/p/pcmanfm/bugs/1109/ -Patch201: pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch +# merged BuildRequires: gcc BuildRequires: libfm-gtk-devel >= %{libfm_minver} @@ -93,7 +78,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} BuildRequires: automake BuildRequires: intltool %endif @@ -106,10 +91,6 @@ BuildRequires: git # Request for now Requires: libfm-gtk-utils -# Still needed for removable media - still now really? -%if 0%{?fedora} < 16 -Requires: hal-storage-addon -%endif # Write explicitly Requires: libfm >= %{libfm_minver} @@ -126,7 +107,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%if 0%{?use_release} || 0%{?use_git} +%if 0%{?use_release} %setup -q -n %{name}-%{version}%{?prever} #install -cpm 644 %{SOURCE1} %{SOURCE2} data/ @@ -146,7 +127,7 @@ install -cpm 0644 [A-Z]* .. git config user.name "pcmanfm Fedora maintainer" git config user.email "pcmanfm-owner@fedoraproject.org" -%if 0%{?use_release} || 0%{?use_git} +%if 0%{?use_release} git add . git commit -q -m "init tree" %endif @@ -156,8 +137,6 @@ cat %PATCH102 | git am cat %PATCH103 | git am cat %PATCH104 | git am -cat %PATCH201 | git am - %if 0%{?use_git} || 0%{?use_gitbare} sh autogen.sh @@ -231,7 +210,10 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog -* Mon Mar 22 2020 Mamoru TASAKA - 1.3.1-3.D20190224gitc52cc4b2 +* Wed Apr 8 2020 Mamoru TASAKA - 1.3.1-4.D20200322gitbe8c60d5 +- Update to the latest git (the previous GIOChannel patch merged) + +* Sun Mar 22 2020 Mamoru TASAKA - 1.3.1-3.D20190224gitc52cc4b2 - main: set the GIOChannel encoding to binary (may fix 1797193) diff --git a/sources b/sources index 40074aa..a345801 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20200322T1948.tar.gz) = 4827eda96ab87423af67f5c05db4d3f8bb556a044103e6f35350f10b45d4e9e93fd6e60d0830057f6495bdd40f7a6a27dc1274626142e155692e975cb50a3c69 +SHA512 (pcmanfm-20200408T1418.tar.gz) = dc9cd99412fbd4bc17b196fb5c9e8cf4568775850403522dfa86f07e09856ebeb32dd787c20ef654eb6f01b92622e97df98fa3f2f92bb008bbaeeef55bb4d250 From ae12ff26da3791e01cae291b3fe0d22ad4568f5d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 May 2020 10:20:04 +0900 Subject: [PATCH 09/45] connect_model: connect to signal before setting folder for model (bug 1645030) --- ...et-the-GIOChannel-encoding-to-binary.patch | 31 ---------- ...nnect-to-signal-before-setting-folde.patch | 60 +++++++++++++++++++ pcmanfm.spec | 11 ++-- 3 files changed, 67 insertions(+), 35 deletions(-) delete mode 100644 pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch create mode 100644 pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch diff --git a/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch b/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch deleted file mode 100644 index 7a2cd91..0000000 --- a/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec3c00ed4c5130fdc8a83b84b587da8457e067f1 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 22 Mar 2020 16:46:48 +0900 -Subject: [PATCH] main: set the GIOChannel encoding to binary - -https://developer.gnome.org/glib/stable/glib-IO-Channels.html#g-io-channel-set-encoding -says the default encoding is UTF-8, and setting encoding to NULL is safe -use with binary data. - -Actually without setting encoding to NULL, on Fedora 32, trying to terminate pcmanfm with -Ctrl-C (SIGINT) causes pcmanfm hang at g_io_channel_read_chars() in on_unix_signal(), -and this is now causing system reboot delayed for 90 seconds with systemd. ---- - src/pcmanfm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pcmanfm.c b/src/pcmanfm.c -index 9be80f7..c0fe84f 100644 ---- a/src/pcmanfm.c -+++ b/src/pcmanfm.c -@@ -239,6 +239,7 @@ int main(int argc, char** argv) - { - GIOChannel* ch = g_io_channel_unix_new(signal_pipe[0]); - g_io_add_watch(ch, G_IO_IN|G_IO_PRI, (GIOFunc)on_unix_signal, NULL); -+ g_io_channel_set_encoding(ch, NULL, NULL); - g_io_channel_unref(ch); - - /* intercept signals */ --- -2.26.0.rc2 - diff --git a/pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch b/pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch new file mode 100644 index 0000000..8bdedaa --- /dev/null +++ b/pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch @@ -0,0 +1,60 @@ +From 25a85bc3ec664864678d33e4c923b0008384d037 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 5 May 2020 09:50:37 +0900 +Subject: [PATCH] connect_model: connect to signal before setting folder for + model + +In connect_model(), when fm_folder_model_new(folder, FALSE) is invoked, in libfm/src/gtk/fm-folder-model.c , +* a new FmFolderModel object *model is created, +* and fm_folder_model_set_folder(model, folder) is called internally. +* When folder is already loaded, fm_folder_model_set_folder() calls _fm_folder_model_add_file() internally for each file in "Desktop" directory, which calls fm_folder_model_file_created(). +* fm_folder_model_file_created() calls _fm_folder_model_insert_item(), and +* _fm_folder_model_insert_item() calls gtk_tree_model_row_inserted() (for each file in "Desktop" directory), which emits "row-inserted" signal to the created model. + +What is the problem here is that this signal is needed for calling on_row_inserted() callback function (in pcmanfm/src/desktop.c), +* which calls fm_folder_model_set_item_userdata(). +* This fm_folder_model_set_item_userdata() call is needed for load_items(), as it tries to call the line: +``` + item = fm_folder_model_get_item_userdata(desktop->model, &it); +``` + and then it tries to access item->fi. + +So with current connect_model() implementation, when folder is already called, on_row_inserted callback function (for "row-inserted" signal) is never called. This causes fm_folder_model_get_item_userdata() return value (in load_itemr) NULL, and it makes segfault when accessing item->fi like https://bugzilla.redhat.com/show_bug.cgi?id=1827445 or so. + +So before setting folder for model by fm_folder_model_set_folder(), connecting model to signal from folder is needed beforehand. +--- + src/desktop.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/desktop.c b/src/desktop.c +index bea6b82..a066059 100644 +--- a/src/desktop.c ++++ b/src/desktop.c +@@ -4875,11 +4875,11 @@ static void on_sort_changed(GtkTreeSortable *model, FmDesktop *desktop) + + static inline void connect_model(FmDesktop *desktop, FmFolder *folder) + { +- desktop->model = fm_folder_model_new(folder, FALSE); ++ desktop->model = fm_folder_model_new(NULL, FALSE); ++ + g_signal_connect(folder, "start-loading", G_CALLBACK(on_folder_start_loading), desktop); + g_signal_connect(folder, "finish-loading", G_CALLBACK(on_folder_finish_loading), desktop); + g_signal_connect(folder, "error", G_CALLBACK(on_folder_error), desktop); +- fm_folder_model_set_icon_size(desktop->model, fm_config->big_icon_size); + g_signal_connect(app_config, "changed::big_icon_size", + G_CALLBACK(on_big_icon_size_changed), desktop->model); + g_signal_connect(desktop->model, "row-deleting", G_CALLBACK(on_row_deleting), desktop); +@@ -4887,6 +4887,10 @@ static inline void connect_model(FmDesktop *desktop, FmFolder *folder) + g_signal_connect(desktop->model, "row-deleted", G_CALLBACK(on_row_deleted), desktop); + g_signal_connect(desktop->model, "row-changed", G_CALLBACK(on_row_changed), desktop); + g_signal_connect(desktop->model, "rows-reordered", G_CALLBACK(on_rows_reordered), desktop); ++ ++ fm_folder_model_set_folder(desktop->model, folder); ++ fm_folder_model_set_icon_size(desktop->model, fm_config->big_icon_size); ++ + #if FM_CHECK_VERSION(1, 0, 2) + fm_folder_model_set_sort(desktop->model, desktop->conf.desktop_sort_by, + desktop->conf.desktop_sort_type); +-- +2.26.2 + diff --git a/pcmanfm.spec b/pcmanfm.spec index 838e7e4..175f1c2 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -17,7 +17,7 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 4 +%global mainrel 5 %if 0%{?use_gitbare} >= 1 %global gitbaredate 20200408 @@ -66,9 +66,8 @@ Patch102: pcmanfm-0102-use-GList-for-FmDesktop-entries-instead-of-static-ar.patc Patch103: pcmanfm-0103-Fix-the-bug-that-desktop-configuration-is-not-proper.patch Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch -# main: set the GIOChannel encoding to binary -# https://sourceforge.net/p/pcmanfm/bugs/1109/ -# merged +# connect_model: connect to signal before setting folder for model +Patch202: pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch BuildRequires: gcc BuildRequires: libfm-gtk-devel >= %{libfm_minver} @@ -136,6 +135,7 @@ cat %PATCH101 | git am cat %PATCH102 | git am cat %PATCH103 | git am cat %PATCH104 | git am +cat %PATCH202 | git am %if 0%{?use_git} || 0%{?use_gitbare} sh autogen.sh @@ -210,6 +210,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Tue May 5 2020 Mamoru TASAKA - 1.3.1-5.D20200322gitbe8c60d5 +- connect_model: connect to signal before setting folder for model (bug 1645030) + * Wed Apr 8 2020 Mamoru TASAKA - 1.3.1-4.D20200322gitbe8c60d5 - Update to the latest git (the previous GIOChannel patch merged) From e545161dcb9ee0950f43b6692f9a959679276ef4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 13:18:07 +0000 Subject: [PATCH 10/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 175f1c2..fc6e3f2 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -210,6 +210,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.1-5.D20200322gitbe8c60d5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 5 2020 Mamoru TASAKA - 1.3.1-5.D20200322gitbe8c60d5 - connect_model: connect to signal before setting folder for model (bug 1645030) From 49a72d03afc33ae9619ff5ff75319a97b755ec09 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 01:10:39 +0000 Subject: [PATCH 11/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- pcmanfm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pcmanfm.spec b/pcmanfm.spec index fc6e3f2..942ea61 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -69,6 +69,7 @@ Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch # connect_model: connect to signal before setting folder for model Patch202: pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch +BuildRequires: make BuildRequires: gcc BuildRequires: libfm-gtk-devel >= %{libfm_minver} BuildRequires: menu-cache-devel From b459f427316cc949c37283dd75dd47f43092f858 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 23:05:10 +0000 Subject: [PATCH 12/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 942ea61..76fa2bc 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.1-5.D20200322gitbe8c60d5.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.1-5.D20200322gitbe8c60d5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b86486fdc1b3ecbdc00aa215536dab9675c6a006 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Feb 2021 15:46:12 +0900 Subject: [PATCH 13/45] Rebase to the latest git --- .gitignore | 1 + create-pcmanfm-git-bare-tarball.sh | 4 ++-- pcmanfm.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5c0c4b2..3e2dd4e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ pcmanfm-0.9.7.tar.gz /pcmanfm-20190110T1400.tar.gz /pcmanfm-20200322T1948.tar.gz /pcmanfm-20200408T1418.tar.gz +/pcmanfm-20210203T1528.tar.gz diff --git a/create-pcmanfm-git-bare-tarball.sh b/create-pcmanfm-git-bare-tarball.sh index 6161a53..5d08947 100644 --- a/create-pcmanfm-git-bare-tarball.sh +++ b/create-pcmanfm-git-bare-tarball.sh @@ -4,7 +4,7 @@ set -x set -e REPONAME=pcmanfm -GITURL=git://git.lxde.org/lxde/${REPONAME}.git +GITURL=https://github.com/lxde/${REPONAME}.git DATE=$(date '+%Y%m%d') TIME=$(date '+%H%M') @@ -18,7 +18,7 @@ pushd $TMPDIR git clone --mirror $GITURL pushd ${REPONAME}.git/ -git log | head -n 4 +git log --format=fuller | head -n 12 popd tar czf ${TARNAME} ${REPONAME}.git/ diff --git a/pcmanfm.spec b/pcmanfm.spec index 76fa2bc..d7ef51e 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -17,13 +17,13 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 5 +%global mainrel 5.100 %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20200408 -%global gitbaretime 1418 -%global githeaddate 20200322 -%global git_rev be8c60d588fc6b527d1cc77df9935bcfa66d52be +%global gitbaredate 20210203 +%global gitbaretime 1528 +%global githeaddate 20210203 +%global git_rev 31394e55a68a079da94e5c521846913898c5e259 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{githeaddate}git%{git_short} %endif @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist} Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Wed Feb 3 2021 Mamoru TASAKA - 1.3.1-6.D20210203git31394e55 +- Rebase to the latest git + * Tue Jan 26 2021 Fedora Release Engineering - 1.3.1-5.D20200322gitbe8c60d5.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a345801..97f4cfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20200408T1418.tar.gz) = dc9cd99412fbd4bc17b196fb5c9e8cf4568775850403522dfa86f07e09856ebeb32dd787c20ef654eb6f01b92622e97df98fa3f2f92bb008bbaeeef55bb4d250 +SHA512 (pcmanfm-20210203T1528.tar.gz) = b4b5b921037de592d9cf17659c3360eb4ad51e8dccbba545454a22dae96e09bae5cdf1f01ade13b72d2badcfe77cee596fcb7e8414c378696178ed9f9e019669 From 4a8f3a330c5d5219154093948a628696e5ddf359 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Feb 2021 15:51:27 +0900 Subject: [PATCH 14/45] fix release --- pcmanfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index d7ef51e..5dd1909 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -17,7 +17,7 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 5.100 +%global mainrel 6 %if 0%{?use_gitbare} >= 1 %global gitbaredate 20210203 From bbe8f7c2d71315ef435e0b5562a6071d61bbaa67 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 7 Feb 2021 15:58:21 +0900 Subject: [PATCH 15/45] 1.3.2 release --- .gitignore | 1 + pcmanfm.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3e2dd4e..b450a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ pcmanfm-0.9.7.tar.gz /pcmanfm-20200322T1948.tar.gz /pcmanfm-20200408T1418.tar.gz /pcmanfm-20210203T1528.tar.gz +/pcmanfm-1.3.2.tar.xz diff --git a/pcmanfm.spec b/pcmanfm.spec index 5dd1909..ac43b28 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -2,22 +2,22 @@ %global with_desktop_vendor_tag 1 %endif -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force %global use_release 1 %endif -%global mainver 1.3.1 +%global mainver 1.3.2 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 6 +%global mainrel 1 %if 0%{?use_gitbare} >= 1 %global gitbaredate 20210203 @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Sun Feb 7 2021 Mamoru TASAKA - 1.3.2-1 +- 1.3.2 release + * Wed Feb 3 2021 Mamoru TASAKA - 1.3.1-6.D20210203git31394e55 - Rebase to the latest git diff --git a/sources b/sources index 97f4cfc..05d2158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20210203T1528.tar.gz) = b4b5b921037de592d9cf17659c3360eb4ad51e8dccbba545454a22dae96e09bae5cdf1f01ade13b72d2badcfe77cee596fcb7e8414c378696178ed9f9e019669 +SHA512 (pcmanfm-1.3.2.tar.xz) = bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9 From 7d4e268770f08b45636599d36c480bcdfe234678 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:50:59 +0000 Subject: [PATCH 16/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index ac43b28..77a39d2 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.3.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Feb 7 2021 Mamoru TASAKA - 1.3.2-1 - 1.3.2 release From b3ac78602d18f264cc5e51716808d3104112f987 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 23:02:54 +0000 Subject: [PATCH 17/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 77a39d2..3224534 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.2-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.3.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 97fe361b2ce90e179b8d75a36f5417d0ea0da88e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:51:18 +0000 Subject: [PATCH 18/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 3224534..cb1ed92 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.3.2-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.3.2-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d7cfd814275b79ae074877888e72b074c4675c0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 23:32:03 +0000 Subject: [PATCH 19/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index cb1ed92..419d5e3 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist}.4 Summary: Extremly fast and lightweight file manager License: GPLv2+ @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-1.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.3.2-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8cebc1222a7f2167ac0ded19d95e13dba2bbc798 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:20:31 +0900 Subject: [PATCH 20/45] rename release macro to make rpmdev-bumprelease work --- pcmanfm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 419d5e3..1f3c101 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %global libfm_minver 1.2.0 @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.4 +Release: %{baserelease}%{?dist}.4 Summary: Extremly fast and lightweight file manager License: GPLv2+ From a82d280442da2df641e7a9742137fdfa63951a65 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:22:44 +0900 Subject: [PATCH 21/45] fix baserelease usage --- pcmanfm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 1f3c101..ba9f501 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -17,7 +17,7 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global mainrel 1 +%global baserelease 1 %if 0%{?use_gitbare} >= 1 %global gitbaredate 20210203 @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %global libfm_minver 1.2.0 @@ -41,7 +41,7 @@ Name: pcmanfm Version: %{mainver} -Release: %{baserelease}%{?dist}.4 +Release: %{fedorarel}%{?dist} Summary: Extremly fast and lightweight file manager License: GPLv2+ From 23216831a5611a5e6743076d66bbcca00918c8d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 18:49:38 +0000 Subject: [PATCH 22/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index ba9f501..3f6ff6f 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -17,7 +17,7 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global baserelease 1 +%global baserelease 2 %if 0%{?use_gitbare} >= 1 %global gitbaredate 20210203 @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-1.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8d6e489ac5fe947759ebc3eea10de6eeca806deb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 12:06:59 +0900 Subject: [PATCH 23/45] indentation --- pcmanfm.spec | 76 +++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index ba9f501..1d3b423 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -1,53 +1,51 @@ -%if (0%{?fedora} && 0%{?fedora} < 19) -%global with_desktop_vendor_tag 1 -%endif - -%global use_release 1 -%global use_gitbare 0 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force -%global use_release 1 +%global use_release 1 %endif -%global mainver 1.3.2 -%undefine prever -%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') +%global mainver 1.3.2 +%undefine prever +%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm -%global baserelease 1 +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20210203 -%global gitbaretime 1528 -%global githeaddate 20210203 -%global git_rev 31394e55a68a079da94e5c521846913898c5e259 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{githeaddate}git%{git_short} +%global gitbaredate 20210203 +%global gitbaretime 1528 + +%global githeaddate 20210203 +%global git_rev 31394e55a68a079da94e5c521846913898c5e259 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{githeaddate}git%{git_short} %endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} -%endif -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%global libfm_minver 1.2.0 +%global libfm_minver 1.2.0 -%undefine _changelog_trimtime +%undefine _changelog_trimtime + +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} +%endif Name: pcmanfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: 1%{?dist} Summary: Extremly fast and lightweight file manager License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ %if 0%{?use_gitbare} >= 1 -Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz +Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz %endif %if 0%{?use_release} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz @@ -69,8 +67,8 @@ Patch104: pcmanfm-0104-Finish-implementation-of-inserting-new-monitor.patch # connect_model: connect to signal before setting folder for model Patch202: pcmanfm-0202-connect_model-connect-to-signal-before-setting-folde.patch -BuildRequires: make -BuildRequires: gcc +BuildRequires: make +BuildRequires: gcc BuildRequires: libfm-gtk-devel >= %{libfm_minver} BuildRequires: menu-cache-devel @@ -89,7 +87,7 @@ BuildRequires: git #BuildRequires: automake # Request for now -Requires: libfm-gtk-utils +Requires: libfm-gtk-utils # Write explicitly Requires: libfm >= %{libfm_minver} @@ -98,9 +96,9 @@ Requires: libfm >= %{libfm_minver} PCMan File Manager is an extremly fast and lightweight file manager which features tabbed browsing and user-friendly interface. -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -108,14 +106,14 @@ developing applications that use %{name}. %prep %if 0%{?use_release} -%setup -q -n %{name}-%{version}%{?prever} +%setup -q -n %{name}-%{main_version}%{?prever}%{git_builddir}%{?prever} #install -cpm 644 %{SOURCE1} %{SOURCE2} data/ git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -T -n %{name}-%{main_version}%{?prever}%{git_builddir}%{?prever} -a 0 git clone ./%{name}.git/ cd %{name} @@ -177,9 +175,6 @@ make install \ INSTALL="install -p" desktop-file-install \ -%if 0%{?with_desktop_vendor_tag} - --vendor fedora \ -%endif --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category 'Application' \ @@ -196,14 +191,15 @@ cd .. %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS -%doc COPYING +%license COPYING %doc README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/%{name}/ -%{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ui/ %{_datadir}/applications/*%{name}*.desktop %config(noreplace) %{_sysconfdir}/xdg/%{name}/ From 0f5e590fdbddaf1af625f42c477a944239fe6ea8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 12:16:07 +0900 Subject: [PATCH 24/45] Update to the latest git --- .gitignore | 33 ++------------------------------- pcmanfm.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 17 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index b450a9c..d996d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,2 @@ -pcmanfm-0.9.7.tar.gz -/pcmanfm-0.9.8.tar.gz -/pcmanfm-0.9.9-git0f075cf5ba8fe1ba5c317ebd2babece067852f18.tar.gz -/pcmanfm-0.9.9-git43fdda452f2153a825df8f44023247a2ebb46b25.tar.gz -/pcmanfm-0.9.9-gitbd677a97832406099ada1fd38a5370d43eee2f99.tar.gz -/pcmanfm-0.9.9-D20110422git3f899d14eb.tar.gz -/pcmanfm-0.9.9-D20110529git99f4474555_tabrework.tar.gz -/pcmanfm-0.9.9-D20110803git07ddaf9cde.tar.gz -/pcmanfm-0.9.9.tar.gz -/pcmanfm-0.9.10.tar.gz -/pcmanfm-1.0.tar.gz -/pcmanfm-1.0.1.tar.gz -/pcmanfm-1.1.0.tar.gz -/pcmanfm-1.1.1.tar.gz -/pcmanfm-1.1.2.tar.gz -/pcmanfm-1.1.2-D20130830gitfc8adaab77.tar.gz -/pcmanfm-1.2.0-rc1.tar.xz -/pcmanfm-1.2.0.tar.xz -/pcmanfm-1.2.1.tar.xz -/pcmanfm-1.2.2.tar.xz -/pcmanfm-1.2.3.tar.xz -/pcmanfm-1.2.4.tar.xz -/pcmanfm-1.2.5.tar.xz -/pcmanfm-20180123T1609.tar.gz -/pcmanfm-1.3.0.tar.xz -/pcmanfm-1.3.1.tar.xz -/pcmanfm-20190110T1400.tar.gz -/pcmanfm-20200322T1948.tar.gz -/pcmanfm-20200408T1418.tar.gz -/pcmanfm-20210203T1528.tar.gz -/pcmanfm-1.3.2.tar.xz +/pcmanfm-*.tar.xz +/pcmanfm-*.tar.gz diff --git a/pcmanfm.spec b/pcmanfm.spec index 1d3b423..7f6c3b4 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -1,12 +1,12 @@ -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force %global use_release 1 %endif -%global mainver 1.3.2 +%global main_version 1.3.2 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20210203 -%global gitbaretime 1528 +%global gitbaredate 20230814 +%global gitbaretime 1207 -%global githeaddate 20210203 -%global git_rev 31394e55a68a079da94e5c521846913898c5e259 +%global githeaddate 20230807 +%global git_rev 752d11b7162e2288b6cd5330b13b8ddfdfeceffd %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -38,11 +38,12 @@ %endif Name: pcmanfm -Version: %{mainver} +Version: %{main_version}%{git_ver_rpm} Release: 1%{?dist} Summary: Extremly fast and lightweight file manager -License: GPLv2+ +# SPDX confirmed +License: GPL-2.0-or-later URL: http://pcmanfm.sourceforge.net/ %if 0%{?use_gitbare} >= 1 Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz @@ -118,7 +119,7 @@ git clone ./%{name}.git/ cd %{name} #git checkout -b %{version}-fedora %{version} -git checkout -b %{version}-fedora %{git_rev} +git checkout -b %{main_version}-fedora %{git_rev} install -cpm 0644 [A-Z]* .. %endif @@ -207,6 +208,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Mon Aug 14 2023 Mamoru TASAKA - 1.3.2^20230807git752d11b7-1 +- Update to the latest git + * Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-1.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 05d2158..9d3152c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-1.3.2.tar.xz) = bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9 +SHA512 (pcmanfm-20230814T1207.tar.gz) = 5353f09b8fd1eaec1db228e59fe99b0b396fab07da5a9ed50174771d0f2a01c85336c96f6667baf7a913b74b6db7d9f4f0d29e653a8459686723aa31ab4e088c From b18fcaa79fd6ccd0c68789266a58865bd59e3b3c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 12:34:45 +0900 Subject: [PATCH 25/45] remove unneeded extra macro --- pcmanfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 10b5b54..06ea877 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -107,7 +107,7 @@ developing applications that use %{name}. %prep %if 0%{?use_release} -%setup -q -n %{name}-%{main_version}%{?prever}%{git_builddir}%{?prever} +%setup -q -n %{name}-%{main_version}%{?prever}%{git_builddir} #install -cpm 644 %{SOURCE1} %{SOURCE2} data/ git init From 6506f20e728542adc9c758605ccccf0a3bcb6f82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 14:17:11 +0900 Subject: [PATCH 26/45] misc fix --- pcmanfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 06ea877..da90faf 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -49,7 +49,7 @@ URL: http://pcmanfm.sourceforge.net/ Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz %endif %if 0%{?use_release} >= 1 -Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz +Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{main_version}%{?prever}.tar.xz %endif ## Missing in the tarball, taken from git tree #Source1: pcmanfm.conf From c8046fb638bf165a8d39a9bc79551db0a6424b0b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 21 Sep 2023 14:22:07 +0900 Subject: [PATCH 27/45] Update to the latest git --- pcmanfm.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index da90faf..4549beb 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20230814 -%global gitbaretime 1207 +%global gitbaredate 20230921 +%global gitbaretime 1410 -%global githeaddate 20230807 -%global git_rev 752d11b7162e2288b6cd5330b13b8ddfdfeceffd +%global githeaddate 20230917 +%global git_rev e6b422b2003126b2116d26cf09f6e6244f1bb41f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -208,6 +208,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Sep 21 2023 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-1 +- Update to the latest git + * Mon Aug 14 2023 Mamoru TASAKA - 1.3.2^20230807git752d11b7-1 - Update to the latest git diff --git a/sources b/sources index 9d3152c..f23c247 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20230814T1207.tar.gz) = 5353f09b8fd1eaec1db228e59fe99b0b396fab07da5a9ed50174771d0f2a01c85336c96f6667baf7a913b74b6db7d9f4f0d29e653a8459686723aa31ab4e088c +SHA512 (pcmanfm-20230921T1410.tar.gz) = a2f74ff9535bea055806a43a9ba473c26ff769a157f3025bc836ab04596d51e5edcad464c0a5853dbe028858569aea4d369f830c97206f512c24856b28501414 From b7ce983787a579453639547a39371381bfef2fae Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Jan 2024 10:43:20 +0900 Subject: [PATCH 28/45] Change -Wincompatible-pointer-types from error to warning --- pcmanfm.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 4549beb..ccd9ed1 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + %global use_release 0 %global use_gitbare 1 @@ -39,7 +42,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -208,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-2 +- Change -Wincompatible-pointer-types from error to warning + * Thu Sep 21 2023 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-1 - Update to the latest git From 83d2a94d5265e3caeb66c091df4ec4fbb3378edd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 12:00:34 +0000 Subject: [PATCH 29/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index ccd9ed1..f23f3ef 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -42,7 +42,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-2 - Change -Wincompatible-pointer-types from error to warning From b59578d39a508ea55135ea22fba5fc413391ad75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 12:18:44 +0000 Subject: [PATCH 30/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index f23f3ef..1b223fd 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -42,7 +42,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 93bb45e094aeb25bc9273fe39d364c43c2cc15d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:37:46 +0000 Subject: [PATCH 31/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 1b223fd..7300352 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -42,7 +42,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -211,6 +211,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e719b972f8aa666e848e8d301a13d0d82bb8abd1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Jul 2024 13:27:47 +0900 Subject: [PATCH 32/45] Apply upstream PR for gcc14 -Werror=incompatible-pointer-types --- pcmanfm.spec | 13 +++++--- ...fix-gcc14-incompatible-pointer-types.patch | 33 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 pr17-fix-gcc14-incompatible-pointer-types.patch diff --git a/pcmanfm.spec b/pcmanfm.spec index 7300352..6ff6165 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - %global use_release 0 %global use_gitbare 1 @@ -42,7 +39,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 5%{?dist} +Release: 6%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -61,6 +58,10 @@ Source1: pcmanfm.desktop.in Source2: pcmanfm-desktop-pref.desktop.in Source100: create-pcmanfm-git-bare-tarball.sh +# https://github.com/lxde/pcmanfm/pull/17 +# Fix build with -Werror=incompatible-pointer-types +Patch17: pr17-fix-gcc14-incompatible-pointer-types.patch + # support new desktop insertion # https://sourceforge.net/p/pcmanfm/bugs/1064/ Patch101: pcmanfm-0101-split-out-per-monitor-initialization-part-from-fm_de.patch @@ -134,6 +135,7 @@ git add . git commit -q -m "init tree" %endif +cat %PATCH17 | git am cat %PATCH101 | git am cat %PATCH102 | git am cat %PATCH103 | git am @@ -211,6 +213,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jul 26 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-6 +- Apply upstream PR for gcc14 -Werror=incompatible-pointer-types + * Thu Jul 18 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/pr17-fix-gcc14-incompatible-pointer-types.patch b/pr17-fix-gcc14-incompatible-pointer-types.patch new file mode 100644 index 0000000..7a31e21 --- /dev/null +++ b/pr17-fix-gcc14-incompatible-pointer-types.patch @@ -0,0 +1,33 @@ +From 9bf5145eba45cd5e3b87d4f040618fe0ea69a81d Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 26 Jul 2024 12:13:32 +0900 +Subject: [PATCH] Fix build with gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to gcc -Werror=incompatible-pointer-types . +This commit adds required casts to different pointer types. +--- + src/desktop.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/desktop.c b/src/desktop.c +index 0686a595..b358f503 100644 +--- a/src/desktop.c ++++ b/src/desktop.c +@@ -1267,7 +1267,7 @@ static AtkObject *fm_desktop_accessible_ref_selection(AtkSelection *selection, + item = items->data; + if (item->item->is_selected) + if (i-- == 0) +- return g_object_ref(item); ++ return (AtkObject *)g_object_ref(item); + } + return NULL; + } +@@ -1454,7 +1454,7 @@ static AtkObject *fm_desktop_accessible_ref_child(AtkObject *accessible, + item = g_list_nth_data(priv->items, index); + if (!item) + return NULL; +- return g_object_ref(item); ++ return (AtkObject *)g_object_ref(item); + } + + static void fm_desktop_accessible_initialize(AtkObject *accessible, gpointer data) From a83ba383c64948cafd6fd326f1331de19556abcc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Aug 2024 14:52:19 +0900 Subject: [PATCH 33/45] Update to the latest git --- pcmanfm.spec | 18 +++++----- ...fix-gcc14-incompatible-pointer-types.patch | 33 ------------------- sources | 2 +- 3 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 pr17-fix-gcc14-incompatible-pointer-types.patch diff --git a/pcmanfm.spec b/pcmanfm.spec index 6ff6165..a188336 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20230921 -%global gitbaretime 1410 +%global gitbaredate 20240813 +%global gitbaretime 1443 -%global githeaddate 20230917 -%global git_rev e6b422b2003126b2116d26cf09f6e6244f1bb41f +%global githeaddate 20240812 +%global git_rev 12abd7e179adb9e31d999824048a5f40f90218fd %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -39,7 +39,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 6%{?dist} +Release: 1%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -58,10 +58,6 @@ Source1: pcmanfm.desktop.in Source2: pcmanfm-desktop-pref.desktop.in Source100: create-pcmanfm-git-bare-tarball.sh -# https://github.com/lxde/pcmanfm/pull/17 -# Fix build with -Werror=incompatible-pointer-types -Patch17: pr17-fix-gcc14-incompatible-pointer-types.patch - # support new desktop insertion # https://sourceforge.net/p/pcmanfm/bugs/1064/ Patch101: pcmanfm-0101-split-out-per-monitor-initialization-part-from-fm_de.patch @@ -135,7 +131,6 @@ git add . git commit -q -m "init tree" %endif -cat %PATCH17 | git am cat %PATCH101 | git am cat %PATCH102 | git am cat %PATCH103 | git am @@ -213,6 +208,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812git12abd7e1-1 +- Update to the latest git + * Fri Jul 26 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-6 - Apply upstream PR for gcc14 -Werror=incompatible-pointer-types diff --git a/pr17-fix-gcc14-incompatible-pointer-types.patch b/pr17-fix-gcc14-incompatible-pointer-types.patch deleted file mode 100644 index 7a31e21..0000000 --- a/pr17-fix-gcc14-incompatible-pointer-types.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9bf5145eba45cd5e3b87d4f040618fe0ea69a81d Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 26 Jul 2024 12:13:32 +0900 -Subject: [PATCH] Fix build with gcc14 -Werror=incompatible-pointer-types - -gcc14 now defaults to gcc -Werror=incompatible-pointer-types . -This commit adds required casts to different pointer types. ---- - src/desktop.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/desktop.c b/src/desktop.c -index 0686a595..b358f503 100644 ---- a/src/desktop.c -+++ b/src/desktop.c -@@ -1267,7 +1267,7 @@ static AtkObject *fm_desktop_accessible_ref_selection(AtkSelection *selection, - item = items->data; - if (item->item->is_selected) - if (i-- == 0) -- return g_object_ref(item); -+ return (AtkObject *)g_object_ref(item); - } - return NULL; - } -@@ -1454,7 +1454,7 @@ static AtkObject *fm_desktop_accessible_ref_child(AtkObject *accessible, - item = g_list_nth_data(priv->items, index); - if (!item) - return NULL; -- return g_object_ref(item); -+ return (AtkObject *)g_object_ref(item); - } - - static void fm_desktop_accessible_initialize(AtkObject *accessible, gpointer data) diff --git a/sources b/sources index f23c247..e39adfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20230921T1410.tar.gz) = a2f74ff9535bea055806a43a9ba473c26ff769a157f3025bc836ab04596d51e5edcad464c0a5853dbe028858569aea4d369f830c97206f512c24856b28501414 +SHA512 (pcmanfm-20240813T1443.tar.gz) = a62476bbd997ba5321bdde16a25ab7b8fb28e29bd6f6f1e83b79f428bbbf88ca811606481df0aa8332c0f152a01cd3cc3bd943c9056494f41a91efa4de50c760 From fe3f208cdceb8f15524ed931abfeeeaa5e7ef56e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 16:51:53 +0900 Subject: [PATCH 34/45] Update to the latest git Update to the latest git --- pcmanfm.spec | 22 ++++++++++++++++++---- sources | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index a188336..d11ad32 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20240813 -%global gitbaretime 1443 +%global gitbaredate 20240825 +%global gitbaretime 1605 -%global githeaddate 20240812 -%global git_rev 12abd7e179adb9e31d999824048a5f40f90218fd +%global githeaddate 20240821 +%global git_rev aa4860d6a7d55284eb92ae8c42df0af879d0b6df %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -120,6 +120,17 @@ cd %{name} #git checkout -b %{version}-fedora %{version} git checkout -b %{main_version}-fedora %{git_rev} + +# Restore timestamps +set +x +echo "Restore timestamps" +git ls-tree -r --name-only HEAD | while read f +do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f +done +set -x + install -cpm 0644 [A-Z]* .. %endif @@ -208,6 +219,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240821gitaa4860d6-1 +- Update to the latest git + * Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812git12abd7e1-1 - Update to the latest git diff --git a/sources b/sources index e39adfd..69bb986 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20240813T1443.tar.gz) = a62476bbd997ba5321bdde16a25ab7b8fb28e29bd6f6f1e83b79f428bbbf88ca811606481df0aa8332c0f152a01cd3cc3bd943c9056494f41a91efa4de50c760 +SHA512 (pcmanfm-20240825T1605.tar.gz) = 1f69013f99c365438d4ff60286d4968fecfa05f758a9150db9b76a09bf75bd55aeb26cc9a19173888e52f553533698d8a5d8cbaa9c366164c49fe3c8e3c428ca From 83fc04e276a019b5ad537383eda1e157afbfd3bb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 23 Nov 2024 16:20:23 +0900 Subject: [PATCH 35/45] update to the latest git --- pcmanfm.spec | 38 ++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index d11ad32..a2b38a5 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global gitbaredate 20240825 -%global gitbaretime 1605 +%global tarballdate 20241123 +%global tarballtime 1608 -%global githeaddate 20240821 -%global git_rev aa4860d6a7d55284eb92ae8c42df0af879d0b6df +%global githeaddate 20241103 +%global git_rev 1312f60320ea3e8dde9777838c42af897ea08548 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -32,21 +32,30 @@ %undefine _changelog_trimtime -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif +%global use_gcc_strict_sanitize 0 + +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + +#%%undefine _annotated_build + Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 1%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed License: GPL-2.0-or-later URL: http://pcmanfm.sourceforge.net/ %if 0%{?use_gitbare} >= 1 -Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz +Source0: %{name}-%{tarballdate}T%{tarballtime}.tar.gz %endif %if 0%{?use_release} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{main_version}%{?prever}.tar.xz @@ -81,6 +90,10 @@ BuildRequires: intltool BuildRequires: automake BuildRequires: intltool %endif +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: git @@ -148,7 +161,7 @@ cat %PATCH103 | git am cat %PATCH104 | git am cat %PATCH202 | git am -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} sh autogen.sh # Patch0 @@ -164,6 +177,12 @@ chmod u+x configure chmod u+x */ %build +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +export LDFLAGS="${LDFLAGS} -pthread" +%endif + %if 0%{?use_gitbare} cd %{name} %endif @@ -219,6 +238,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Sat Nov 23 2024 Mamoru TASAKA - 1.3.2^20241103git1312f603-1 +- Update to the latest git + * Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240821gitaa4860d6-1 - Update to the latest git diff --git a/sources b/sources index 69bb986..b795ba7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20240825T1605.tar.gz) = 1f69013f99c365438d4ff60286d4968fecfa05f758a9150db9b76a09bf75bd55aeb26cc9a19173888e52f553533698d8a5d8cbaa9c366164c49fe3c8e3c428ca +SHA512 (pcmanfm-20241123T1608.tar.gz) = f7f7e90c68638985821349df2c231a42447725823877d1734e522f65060f4734d51cf323823f44b1155bcc0642602b8533a2627d64029321451e63637af51416 From 34337e29c1a78e82bb4b6755699822123dbe8c6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 Dec 2024 11:15:26 +0900 Subject: [PATCH 36/45] Update to the latest git --- pcmanfm.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index a2b38a5..5a35cad 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global tarballdate 20241123 -%global tarballtime 1608 +%global tarballdate 20241206 +%global tarballtime 1101 -%global githeaddate 20241103 -%global git_rev 1312f60320ea3e8dde9777838c42af897ea08548 +%global githeaddate 20241203 +%global git_rev 836c77c821525a3317491128012d7dd38979d9d8 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -238,6 +238,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203git836c77c8-1 +- Update to the latest git + * Sat Nov 23 2024 Mamoru TASAKA - 1.3.2^20241103git1312f603-1 - Update to the latest git diff --git a/sources b/sources index b795ba7..c0c04e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20241123T1608.tar.gz) = f7f7e90c68638985821349df2c231a42447725823877d1734e522f65060f4734d51cf323823f44b1155bcc0642602b8533a2627d64029321451e63637af51416 +SHA512 (pcmanfm-20241206T1101.tar.gz) = b487b8b776a5a26156e7a52c43c084e0b23feedc4e65c6b840cdc3e832e22e821a207dc317fd8ffd8117695d18e96420566d27427daba56a265acf87a959a6a0 From 88a1d8caaf5f1a70f2045bc2b5f9e50219ad9b30 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Dec 2024 17:45:09 +0900 Subject: [PATCH 37/45] Update to the latest git --- pcmanfm.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 5a35cad..6b76690 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,11 +18,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global tarballdate 20241206 -%global tarballtime 1101 +%global tarballdate 20241225 +%global tarballtime 1736 -%global githeaddate 20241203 -%global git_rev 836c77c821525a3317491128012d7dd38979d9d8 +%global githeaddate 20241216 +%global git_rev a8ae14c5de336f56efbc5a98b7d5c50a833f20b3 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -238,6 +238,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-1 +- Update to the latest git + * Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203git836c77c8-1 - Update to the latest git diff --git a/sources b/sources index c0c04e5..a9feb74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20241206T1101.tar.gz) = b487b8b776a5a26156e7a52c43c084e0b23feedc4e65c6b840cdc3e832e22e821a207dc317fd8ffd8117695d18e96420566d27427daba56a265acf87a959a6a0 +SHA512 (pcmanfm-20241225T1736.tar.gz) = bc000a6f639e5766073595d0668e70555acbefcb7f4c27c12ba55f3a5ea3860e91505710b321559c2ee4b610c2d151953fac4eb28443a9f16acef3a1f08da393 From b04cd38586444de8a0eeb0938c35dc157d230b8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:33:59 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 6b76690..ff3deac 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -48,7 +48,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -238,6 +238,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20241216gita8ae14c5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-1 - Update to the latest git From 16a216e155a1932c4404f03f7b986bfb1428b5db Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Feb 2025 16:08:09 +0900 Subject: [PATCH 39/45] Rebuild with libfm 1.4.0 for date format option --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index ff3deac..6d8ce26 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -48,7 +48,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist}%{flagrel} +Release: 3%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -238,6 +238,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Wed Feb 19 2025 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-3 +- Rebuild with libfm 1.4.0 for date format option + * Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20241216gita8ae14c5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 60da21be416039ee349525ef31eee5747e24770a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 6 Mar 2025 15:13:06 +0900 Subject: [PATCH 40/45] 1.4.0 --- pcmanfm.spec | 20 +++++++++++++------- sources | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 6d8ce26..08281a0 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -6,7 +6,7 @@ %global use_release 1 %endif -%global main_version 1.3.2 +%global main_version 1.4.0 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -18,24 +18,27 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global tarballdate 20241225 -%global tarballtime 1736 +%global tarballdate 20250306 +%global tarballtime 1455 +%define use_gitcommit_as_rel 0 -%global githeaddate 20241216 -%global git_rev a8ae14c5de336f56efbc5a98b7d5c50a833f20b3 +%global githeaddate 20250304 +%global git_rev 50aa9435c49551993fcd3c20d18615795c8daedf %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif -%global libfm_minver 1.2.0 +%global libfm_minver 1.4.0 %undefine _changelog_trimtime %if 0%{?use_gitbare} +%if 0%{?use_gitcommit_as_rel} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif +%endif %global use_gcc_strict_sanitize 0 @@ -48,7 +51,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -238,6 +241,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Mar 06 2025 Mamoru TASAKA - 1.4.0-1 +- 1.4.0 + * Wed Feb 19 2025 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-3 - Rebuild with libfm 1.4.0 for date format option diff --git a/sources b/sources index a9feb74..5d0a76e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20241225T1736.tar.gz) = bc000a6f639e5766073595d0668e70555acbefcb7f4c27c12ba55f3a5ea3860e91505710b321559c2ee4b610c2d151953fac4eb28443a9f16acef3a1f08da393 +SHA512 (pcmanfm-20250306T1455.tar.gz) = dd79e6c183389a02b0825b2ef072b4ea890737935e627abbaf9b4dccfadd8be785c142521a14a5faacf0295d24282ca5bca81e10291175ec0c5657e45deb4df0 From bc048065ee7617ab681bae4994dc4688b2cff272 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 May 2025 13:38:27 +0900 Subject: [PATCH 41/45] Call autopoint with gettext 0.25 (ref: bug 2366708) --- pcmanfm.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 08281a0..fc3da67 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -51,7 +51,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -87,6 +87,7 @@ BuildRequires: menu-cache-devel BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: intltool %if 0%{?use_gitbare} @@ -165,8 +166,10 @@ cat %PATCH104 | git am cat %PATCH202 | git am %if 0%{?use_gitbare} -sh autogen.sh - +# gettext 0.25 needs autopoint +sed -i configure.ac \ + -e '\@IT_PROG_INTLTOOL@i AM_GNU_GETTEXT_VERSION([0.19])' +autopoint -f # Patch0 autoreconf -fi %endif @@ -241,6 +244,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Sat May 17 2025 Mamoru TASAKA - 1.4.0-2 +- Call autopoint with gettext 0.25 (ref: bug 2366708) + * Thu Mar 06 2025 Mamoru TASAKA - 1.4.0-1 - 1.4.0 From e7fb037699e97158e91396f5511a39cb8e20a930 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 May 2025 13:45:33 +0900 Subject: [PATCH 42/45] include local m4 directory --- pcmanfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index fc3da67..50cc234 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -171,7 +171,7 @@ sed -i configure.ac \ -e '\@IT_PROG_INTLTOOL@i AM_GNU_GETTEXT_VERSION([0.19])' autopoint -f # Patch0 -autoreconf -fi +autoreconf -fi -I m4 %endif # permission fix From 79087870acac9fdcedb2cc9f8e692fee8654353b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2025 16:34:02 +0900 Subject: [PATCH 43/45] Use ACLOCAL_PATH environment instead of calling autopoint --- pcmanfm.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 50cc234..3184259 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -51,7 +51,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist}%{flagrel} +Release: 3%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -166,12 +166,10 @@ cat %PATCH104 | git am cat %PATCH202 | git am %if 0%{?use_gitbare} -# gettext 0.25 needs autopoint -sed -i configure.ac \ - -e '\@IT_PROG_INTLTOOL@i AM_GNU_GETTEXT_VERSION([0.19])' -autopoint -f +# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) +export ACLOCAL_PATH=%{_datadir}/gettext/m4/ # Patch0 -autoreconf -fi -I m4 +autoreconf -fi %endif # permission fix @@ -244,6 +242,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Mon May 26 2025 Mamoru TASAKA - 1.4.0-3 +- Use ACLOCAL_PATH environment instead of calling autopoint + * Sat May 17 2025 Mamoru TASAKA - 1.4.0-2 - Call autopoint with gettext 0.25 (ref: bug 2366708) From 3d31355edbbcef13681064ac3d040f4b8bef7a61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 00:02:38 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- pcmanfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 3184259..51ec23a 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -51,7 +51,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist}%{flagrel} +Release: 4%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -242,6 +242,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 26 2025 Mamoru TASAKA - 1.4.0-3 - Use ACLOCAL_PATH environment instead of calling autopoint From fe418e858aa269b1bea7ce5140d1eccb6b0f46f1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Dec 2025 14:26:58 +0900 Subject: [PATCH 45/45] update to the latest git --- pcmanfm.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pcmanfm.spec b/pcmanfm.spec index 51ec23a..030f20d 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -18,12 +18,12 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global tarballdate 20250306 -%global tarballtime 1455 -%define use_gitcommit_as_rel 0 +%global tarballdate 20251218 +%global tarballtime 1224 +%define use_gitcommit_as_rel 1 -%global githeaddate 20250304 -%global git_rev 50aa9435c49551993fcd3c20d18615795c8daedf +%global githeaddate 20251022 +%global git_rev 09087446392d08c25412cade107bdec0a6e8ae7b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif @@ -51,7 +51,7 @@ Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 4%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: Extremly fast and lightweight file manager # SPDX confirmed @@ -242,6 +242,9 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog +* Thu Dec 18 2025 Mamoru TASAKA - 1.4.0^20251022git09087446-1 +- Update to the latest git + * Fri Jul 25 2025 Fedora Release Engineering - 1.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 5d0a76e..d68685d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20250306T1455.tar.gz) = dd79e6c183389a02b0825b2ef072b4ea890737935e627abbaf9b4dccfadd8be785c142521a14a5faacf0295d24282ca5bca81e10291175ec0c5657e45deb4df0 +SHA512 (pcmanfm-20251218T1224.tar.gz) = 41427507b7cdb3d8eb142f858d5228394aa6eaabe38405dc20c12d3c94efd2bc88e6ccda49d9a9b463cbf0092e8f9bed5aa76a0aa23a0a573071a53ab78a3100