From ed83457c20631ac9049fc238c94f5e23d825f584 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Jan 2025 22:17:22 +0900 Subject: [PATCH 01/10] Apply upstream PR for C23 with function prototype strictness --- libfm-pr107-c23-prototype.patch | 29 +++++++++++++++++++++++++++++ libfm.spec | 10 +++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 libfm-pr107-c23-prototype.patch diff --git a/libfm-pr107-c23-prototype.patch b/libfm-pr107-c23-prototype.patch new file mode 100644 index 0000000..1fb76c1 --- /dev/null +++ b/libfm-pr107-c23-prototype.patch @@ -0,0 +1,29 @@ +From 69fb77bbe4d5003fe0b36f524454d3592994b51c Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 14 Jan 2025 18:00:03 +0900 +Subject: [PATCH] FIX: function argument fix for C23 conformance + +C23 now regards function declaration without a parameter list +as that with no parameter (i.e. having `(void)`). + +Specify parameter list explicitly to make code C23 +conformant. + +Closes #106 . +--- + src/base/fm-dummy-monitor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/base/fm-dummy-monitor.c b/src/base/fm-dummy-monitor.c +index 6ece1fcc..cf1bcf89 100644 +--- a/src/base/fm-dummy-monitor.c ++++ b/src/base/fm-dummy-monitor.c +@@ -37,7 +37,7 @@ + + G_DEFINE_TYPE(FmDummyMonitor, fm_dummy_monitor, G_TYPE_FILE_MONITOR); + +-static gboolean cancel() ++static gboolean cancel(GFileMonitor *) + { + return TRUE; + } diff --git a/libfm.spec b/libfm.spec index 66c40c5..3b48c7b 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -75,6 +75,9 @@ Source10: create-libfm-git-bare-tarball.sh # when subsequent config file does not contain such key but previous key had # (related to bug 2011471) Patch1: libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch +# https://github.com/lxde/libfm/pull/107/ +# Fix for C23 +Patch10: libfm-pr107-c23-prototype.patch # http://sourceforge.net/p/pcmanfm/feature-requests/385/ #Patch1000: http://sourceforge.net/p/pcmanfm/feature-requests/_discuss/thread/0a50a386/597e/attachment/libfm-1.2.3-moduledir-gtkspecific-v02.patch Patch1000: libfm-1.3.0.2-moduledir-gtkspecific-v03.patch @@ -260,6 +263,8 @@ cat %PATCH1 | git am %patch -P1000 -p1 -Z git commit -m "Use gtk version specific module directory" -a +cat %PATCH10 | git am + # Need reporting upstream # ref: https://github.com/lxde/libfm/commit/1af95bd8f26cab6848a74b7e02b53c6c79fb53a5 sed -i Makefile.am \ @@ -491,6 +496,9 @@ fi %endif %changelog +* Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-2 +- Apply upstream PR for C23 with function prototype strictness + * Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-1 - Update to the latest git From a9dc9ac67a1a7af177482080b2856e0e78ebb28a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:14:00 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 3b48c7b..034088e 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -496,6 +496,9 @@ fi %endif %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20250109git2d94c3c8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-2 - Apply upstream PR for C23 with function prototype strictness From 58adc101efbb91d24d26399567155dd7ca3454d6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 Feb 2025 15:11:42 +0900 Subject: [PATCH 03/10] update to the latest git --- libfm-pr107-c23-prototype.patch | 29 ----------------------------- libfm.spec | 18 ++++++++---------- sources | 2 +- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 libfm-pr107-c23-prototype.patch diff --git a/libfm-pr107-c23-prototype.patch b/libfm-pr107-c23-prototype.patch deleted file mode 100644 index 1fb76c1..0000000 --- a/libfm-pr107-c23-prototype.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 69fb77bbe4d5003fe0b36f524454d3592994b51c Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Tue, 14 Jan 2025 18:00:03 +0900 -Subject: [PATCH] FIX: function argument fix for C23 conformance - -C23 now regards function declaration without a parameter list -as that with no parameter (i.e. having `(void)`). - -Specify parameter list explicitly to make code C23 -conformant. - -Closes #106 . ---- - src/base/fm-dummy-monitor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/fm-dummy-monitor.c b/src/base/fm-dummy-monitor.c -index 6ece1fcc..cf1bcf89 100644 ---- a/src/base/fm-dummy-monitor.c -+++ b/src/base/fm-dummy-monitor.c -@@ -37,7 +37,7 @@ - - G_DEFINE_TYPE(FmDummyMonitor, fm_dummy_monitor, G_TYPE_FILE_MONITOR); - --static gboolean cancel() -+static gboolean cancel(GFileMonitor *) - { - return TRUE; - } diff --git a/libfm.spec b/libfm.spec index 034088e..43db99a 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20250114 -%global gittartime 1503 +%global gittardate 20250207 +%global gittartime 1425 -%global gitbaredate 20250109 -%global git_rev 2d94c3c8c4a2c4e252a79da3ef2b6a70e9ec37e1 +%global gitbaredate 20250114 +%global git_rev 493571d155040f13f61feff6dfbca731e5664543 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -40,7 +40,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 1%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -75,9 +75,6 @@ Source10: create-libfm-git-bare-tarball.sh # when subsequent config file does not contain such key but previous key had # (related to bug 2011471) Patch1: libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch -# https://github.com/lxde/libfm/pull/107/ -# Fix for C23 -Patch10: libfm-pr107-c23-prototype.patch # http://sourceforge.net/p/pcmanfm/feature-requests/385/ #Patch1000: http://sourceforge.net/p/pcmanfm/feature-requests/_discuss/thread/0a50a386/597e/attachment/libfm-1.2.3-moduledir-gtkspecific-v02.patch Patch1000: libfm-1.3.0.2-moduledir-gtkspecific-v03.patch @@ -263,8 +260,6 @@ cat %PATCH1 | git am %patch -P1000 -p1 -Z git commit -m "Use gtk version specific module directory" -a -cat %PATCH10 | git am - # Need reporting upstream # ref: https://github.com/lxde/libfm/commit/1af95bd8f26cab6848a74b7e02b53c6c79fb53a5 sed -i Makefile.am \ @@ -496,6 +491,9 @@ fi %endif %changelog +* Fri Feb 07 2025 Mamoru TASAKA - 1.3.2^20250114git493571d1-1 +- Update to the latest git + * Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20250109git2d94c3c8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 72d34c3..c25c660 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20250114T1503.tar.gz) = 2665058991e9a22d36392ecaa7b0a4587e2b470f49e616f98abe579bebe29bc11e7d354120f7bea1f77786122720f6048fc7bfd76b1d94e500c8a602d1620877 +SHA512 (libfm-20250207T1425.tar.gz) = fafa70fce05d8831e394e4dd7f11b64a5b1fc998d83c3d8145d22880aeb47e0d618761c6c558b7375b0800d4944dd03290b55633d84c654a0b8632037fb7b95a From 6fcfbacffc365e4274b2764928d48f9f74014b45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Feb 2025 16:37:13 +0900 Subject: [PATCH 04/10] update to the latest git --- libfm.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libfm.spec b/libfm.spec index 43db99a..cad9b42 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20250207 -%global gittartime 1425 +%global gittardate 20250216 +%global gittartime 1627 -%global gitbaredate 20250114 -%global git_rev 493571d155040f13f61feff6dfbca731e5664543 +%global gitbaredate 20250215 +%global git_rev 9ea11dca56c039f0d659e243a8b9a5a95c10b6d4 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -491,6 +491,9 @@ fi %endif %changelog +* Sun Feb 16 2025 Mamoru TASAKA - 1.3.2^20250215git9ea11dca-1 +- Update to the latest git + * Fri Feb 07 2025 Mamoru TASAKA - 1.3.2^20250114git493571d1-1 - Update to the latest git diff --git a/sources b/sources index c25c660..c696150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20250207T1425.tar.gz) = fafa70fce05d8831e394e4dd7f11b64a5b1fc998d83c3d8145d22880aeb47e0d618761c6c558b7375b0800d4944dd03290b55633d84c654a0b8632037fb7b95a +SHA512 (libfm-20250216T1627.tar.gz) = 18b0a899be1d8021d88868b4beccbfbb43afbbaeefcf54a67dd9e7f895d3c24bcc030e94ed034908b3db898a92be030310aba17f247195019599fdfe298c1651 From 020ea9d18f207eea432794c478df222edd4ab22d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Feb 2025 16:08:42 +0900 Subject: [PATCH 05/10] 1.4.0 --- libfm.spec | 24 +++++++++++++++++++----- sources | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libfm.spec b/libfm.spec index cad9b42..8dd5857 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,20 +18,27 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20250216 -%global gittartime 1627 +%global gittardate 20250219 +%global gittartime 1523 +%define use_gitcommit_as_rel 0 -%global gitbaredate 20250215 -%global git_rev 9ea11dca56c039f0d659e243a8b9a5a95c10b6d4 +%global gitbaredate 20250218 +%global git_rev 13e5c3eb6186c62c60ce449ed01a49c89b3adaa0 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} +%if 0%{?use_gitcommit_as_rel} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} +%else +%global git_ver_rpm %{nil} +%global git_builddir %{nil} +%endif + %endif -%global main_version 1.3.2 +%global main_version 1.4.0 %global bootstrap 0 %global build_doc 1 @@ -221,6 +228,10 @@ git init git clone ./%{name}.git/ cd %{name} +%if !%{use_gitcommit_as_rel} +git checkout -b fedora-%{version} %{version} +%endif + # Restore timestamps set +x echo "Restore timestamps" @@ -491,6 +502,9 @@ fi %endif %changelog +* Wed Feb 19 2025 Mamoru TASAKA - 1.4.0-1 +- 1.4.0 + * Sun Feb 16 2025 Mamoru TASAKA - 1.3.2^20250215git9ea11dca-1 - Update to the latest git diff --git a/sources b/sources index c696150..1431db8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20250216T1627.tar.gz) = 18b0a899be1d8021d88868b4beccbfbb43afbbaeefcf54a67dd9e7f895d3c24bcc030e94ed034908b3db898a92be030310aba17f247195019599fdfe298c1651 +SHA512 (libfm-20250219T1523.tar.gz) = dd8b7c886e487178f8f219eb53c027a2be47d5d6f44f8df9edc3abad999eb845c02f53729199279a5ad45443d707d0a4eac2fc9ef04c92771007b91e191ccbf9 From cb9293800449213bf92616456e4f79f4486e8773 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 22 Mar 2025 17:54:33 +0900 Subject: [PATCH 06/10] Update to the latest git --- libfm.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libfm.spec b/libfm.spec index 8dd5857..a4719e6 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,12 +18,12 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20250219 -%global gittartime 1523 -%define use_gitcommit_as_rel 0 +%global gittardate 20250322 +%global gittartime 1009 +%define use_gitcommit_as_rel 1 -%global gitbaredate 20250218 -%global git_rev 13e5c3eb6186c62c60ce449ed01a49c89b3adaa0 +%global gitbaredate 20250316 +%global git_rev 3289abf583030c664babae64a73d1981afcbe8ed %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -502,6 +502,9 @@ fi %endif %changelog +* Sat Mar 22 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-1 +- Update to the latest git + * Wed Feb 19 2025 Mamoru TASAKA - 1.4.0-1 - 1.4.0 diff --git a/sources b/sources index 1431db8..8f5e837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20250219T1523.tar.gz) = dd8b7c886e487178f8f219eb53c027a2be47d5d6f44f8df9edc3abad999eb845c02f53729199279a5ad45443d707d0a4eac2fc9ef04c92771007b91e191ccbf9 +SHA512 (libfm-20250322T1009.tar.gz) = f0624219aafbb76b19c215df99dfde4b1ad5a739c7af07f5966ab9e6531a9fe8a76c3225fb3bfcca37093e04ef48f5196880bc1600b1265cee0d34e64aaec406 From 20cd659875e036fd458d913209f27714825538da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2025 16:54:35 +0900 Subject: [PATCH 07/10] Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) --- libfm.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index a4719e6..65f5eb7 100644 --- a/libfm.spec +++ b/libfm.spec @@ -47,7 +47,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -277,6 +277,8 @@ sed -i Makefile.am \ -e '\@docs/reference/libfm/libfm-sections.txt@d' git commit -m "Remove files entry to be regenerated" -a || true +# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) +export ACLOCAL_PATH=%{_datadir}/gettext/m4/ sh autogen.sh git commit -m "save modified files" -a || true @@ -502,6 +504,9 @@ fi %endif %changelog +* Mon May 26 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-2 +- Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) + * Sat Mar 22 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-1 - Update to the latest git From 6afb27b908e8a9c8689c1a0f552ceb9f15bbf1a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:39:18 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 65f5eb7..96666ac 100644 --- a/libfm.spec +++ b/libfm.spec @@ -47,7 +47,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -504,6 +504,9 @@ fi %endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.4.0^20250316git3289abf5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 26 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-2 - Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) From 7dd64a1b4c12c87d5190443de623043582859fd2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 17 Dec 2025 23:45:12 +0900 Subject: [PATCH 09/10] 1.4.1 --- libfm.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libfm.spec b/libfm.spec index 96666ac..5fc24d7 100644 --- a/libfm.spec +++ b/libfm.spec @@ -15,15 +15,13 @@ %global git_ver_rpm %{nil} %global git_builddir %{nil} -%global main_version 1.3.2 - %if 0%{?use_gitbare} -%global gittardate 20250322 -%global gittartime 1009 -%define use_gitcommit_as_rel 1 +%global gittardate 20251217 +%global gittartime 2335 +%define use_gitcommit_as_rel 0 -%global gitbaredate 20250316 -%global git_rev 3289abf583030c664babae64a73d1981afcbe8ed +%global gitbaredate 20251214 +%global git_rev 7e575d13fcf0532fc181fc26391ad6fd7717ed66 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -38,7 +36,7 @@ %endif -%global main_version 1.4.0 +%global main_version 1.4.1 %global bootstrap 0 %global build_doc 1 @@ -47,7 +45,7 @@ Name: libfm Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 1%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -504,6 +502,9 @@ fi %endif %changelog +* Wed Dec 17 2025 Mamoru TASAKA - 1.4.1-1 +- 1.4.1 + * Thu Jul 24 2025 Fedora Release Engineering - 1.4.0^20250316git3289abf5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e90768b40a0c1c8c8001efe9f45a620ce9c94bbe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 17 Dec 2025 23:46:59 +0900 Subject: [PATCH 10/10] 1.4.1 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 8f5e837..6e2ccab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20250322T1009.tar.gz) = f0624219aafbb76b19c215df99dfde4b1ad5a739c7af07f5966ab9e6531a9fe8a76c3225fb3bfcca37093e04ef48f5196880bc1600b1265cee0d34e64aaec406 +SHA512 (libfm-20251217T2335.tar.gz) = 22310c122892588d23196b21e4e8e251fb83a49a6e8d0bd86abdc93e20d427d6f81f738f3fb8500c0aaf7d6ff7be5752329435b80ce36f5aa5c42353ab0e1864