From 036e6324676abb38b06c065e9c306ad19a36520c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:42 +0100 Subject: [PATCH 01/51] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libfm.spec | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/libfm.spec b/libfm.spec index f5c4815..46385f1 100644 --- a/libfm.spec +++ b/libfm.spec @@ -104,9 +104,6 @@ BuildRequires: git Obsoletes: %{name}-devel-docs < 0.1.15 %endif -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - %description LibFM is a GIO-based library used to develop file manager-like programs. It is @@ -388,33 +385,12 @@ do popd done -%post -/sbin/ldconfig -touch --no-create %{_datadir}/mime/packages &> /dev/null || : - %pre devel # Directory -> symlink if [ -d %{_includedir}/libfm ] ; then rm -rf %{_includedir}/libfm fi -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi - -%posttrans -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - -%post gtk -p /sbin/ldconfig -%postun gtk -p /sbin/ldconfig -%if 0%{?fedora} >= 22 -%post gtk2 -p /sbin/ldconfig -%postun gtk2 -p /sbin/ldconfig -%endif - %if 0%{?bootstrap} %files %else From a282d7334cec81adb3f8b5359630cfa5facacb9f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 02/51] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libfm.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libfm.spec b/libfm.spec index 46385f1..a809ad6 100644 --- a/libfm.spec +++ b/libfm.spec @@ -52,7 +52,6 @@ Version: %{mainver} Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs -Group: System Environment/Libraries License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ %if 0%{?userelease} >= 1 @@ -117,7 +116,6 @@ This package contains the generic non-gui functions of libfm. %package gtk Summary: File manager-related GTK+ widgets of %{name} -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gvfs @@ -132,7 +130,6 @@ This package provides useful file manager-related GTK+ 3 widgets. %package gtk2 Summary: File manager-related GTK+ widgets of %{name} -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gvfs @@ -147,7 +144,6 @@ This package provides useful file manager-related GTK+ 2 widgets. %package gtk-utils Summary: GTK+ related utility package for %{name} -Group: User Interface/Desktops Requires: %{name}-gtk%{?isa} = %{version}-%{release} Obsoletes: lxshortcut < 0.1.3 Provides: lxshortcut = %{version}-%{release} @@ -160,7 +156,6 @@ This package contains some GTK+ related utility files for %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -170,7 +165,6 @@ developing applications that use %{name}. %package gtk-devel-common Summary: Common Development files for %{name}-gtk -Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} BuildArch: noarch @@ -181,7 +175,6 @@ developing applications that use %{name}-gtk. %package gtk-devel Summary: Development files for %{name}-gtk -Group: Development/Libraries Requires: %{name}-gtk%{?_isa} = %{version}-%{release} Requires: %{name}-gtk-devel-common = %{version}-%{release} @@ -191,7 +184,6 @@ developing applications that use %{name}-gtk. %package gtk2-devel Summary: Development files for %{name}-gtk2 -Group: Development/Libraries Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk-devel-common = %{version}-%{release} @@ -201,7 +193,6 @@ developing applications that use %{name}-gtk2. %package devel-docs Summary: Development documation for %{name} -Group: Development/Libraries %description devel-docs This package containg development documentation files for %{name}. From 93390dd2350ea53a297935a68f86dc666780f1db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:08:29 +0000 Subject: [PATCH 03/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index a809ad6..dc7448d 100644 --- a/libfm.spec +++ b/libfm.spec @@ -49,7 +49,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -460,6 +460,9 @@ fi %endif %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Dec 19 2018 Mamoru TASAKA - 1.3.1-1 - 1.3.1 release From 4e0fd627b02189993db58051b441b9c23203bf12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:16:20 +0000 Subject: [PATCH 04/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index dc7448d..9ecf44a 100644 --- a/libfm.spec +++ b/libfm.spec @@ -49,7 +49,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -460,6 +460,9 @@ fi %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0503cf1e6a88c69b87b94ec4c74d523df3d235bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:08:09 +0000 Subject: [PATCH 05/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 9ecf44a..d44047a 100644 --- a/libfm.spec +++ b/libfm.spec @@ -49,7 +49,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -460,6 +460,9 @@ fi %endif %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.3.1-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6c1aa811b836b69f057be701359e695f45bf50ef Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Apr 2020 14:09:08 +0900 Subject: [PATCH 06/51] Update to the latest git --- .gitignore | 1 + libfm.spec | 68 +++++++++++++++--------------------------------------- sources | 2 +- 3 files changed, 21 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index aa9752b..4e01453 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ libfm-0.1.12.tar.gz /libfm-20171230T1949.tar.gz /libfm-1.3.0.2.tar.xz /libfm-1.3.1.tar.xz +/libfm-20200407T1514.tar.gz diff --git a/libfm.spec b/libfm.spec index d44047a..a4475e3 100644 --- a/libfm.spec +++ b/libfm.spec @@ -3,44 +3,35 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm # add bootstrap, need to build menu-cache in epel7 -%global userelease 1 -%global usegit 0 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 -%if 0%{?usegit} < 1 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%endif %global bootstrap 0 %global mainver 1.3.1 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 - -%if 0%{?usegit} >= 1 -%global githash ab583d7800bbc308f2852384f87c2357f49b01cd -%global shorthash %(TMP=%githash ; echo ${TMP:0:10}) -%global gitdate Fri, 9 Dec 2016 01:44:54 +0200 -%global gitdate_num 20161209 -%endif +%global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitbaredate 20171230 -%global gitbaretime 1949 +%global gitcommit 8914a52b0916fde8ac5d3cfc9a35ed553a1e089f +%global gitdate 20200401 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) + +%global tarballdate 20200407 +%global tarballtime 1514 %endif %if 0%{?userelease} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif -%if 0%{?usegit} >= 1 -%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash} -%endif %if 0%{?usegitbare} >= 1 -%global fedorarel %{mainrel}.gitD%{gitbaredate} +%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit}%{?dist} %endif %global build_doc 1 @@ -49,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -58,11 +49,8 @@ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz Source1: https://raw.githubusercontent.com/lxde/libfm/master/autogen.sh %endif -%if 0%{?usegit} >= 1 -Source0: https://github.com/lxde/libfm/archive/%{githash}/%{name}-%{version}-D%{gitdate_num}git%{githash}.tar.gz -%endif %if 0%{?usegitbare} >= 1 -Source0: libfm-%{gitbaredate}T%{gitbaretime}.tar.gz +Source0: libfm-%{tarballdate}T%{tarballtime}.tar.gz %endif Source10: create-libfm-git-bare-tarball.sh @@ -72,9 +60,7 @@ Patch1000: libfm-1.3.0.2-moduledir-gtkspecific-v03.patch BuildRequires: libexif-devel BuildRequires: gtk3-devel -%if 0%{?fedora} >= 22 BuildRequires: gtk2-devel -%endif %if ! 0%{?bootstrap} BuildRequires: menu-cache-devel >= 0.3.2 @@ -204,12 +190,6 @@ This package containg development documentation files for %{name}. cp -a %{SOURCE1} . #%%patch0 -p1 -b .orig %endif -%if 0%{?usegit} >= 1 -%setup -q -n %{name}-%{githash} -%endif - -%if 0%{?usegitbare} < 1 -%endif %if 0%{?usegitbare} >= 1 %setup -q -c -T -a 0 @@ -220,7 +200,7 @@ cp -a [A-Z]* .. git config user.name "libfm Fedora maintainer" git config user.email "libfm-maintainer@fedoraproject.org" -git checkout -b %{version}-fedora %{version} +git checkout -b %{version}-fedora %{gitcommit} cat > GITHASH <= 22 %patch1000 -p1 -%endif %if 0%{?usegitbare} >= 1 git commit -m "Use gtk version specific module directory" -a %endif @@ -251,7 +229,7 @@ sed -i.libdir_syssearch \ cd libfm %endif -%if (0%{?usegitbare} >= 1) || (0%{?usegit} >= 1) +%if 0%{?usegitbare} >= 1 # Workaround # Once generate files anyway ./configure @@ -260,9 +238,7 @@ rm -f config.status %endif for ver in \ -%if 0%{?fedora} >= 22 2 \ -%endif 3 \ %{nil} do @@ -338,7 +314,6 @@ done # GTK2 %if ! 0%{?bootstrap} -%if 0%{?fedora} >= 22 pushd INSTDIR-gtk2 find . -name '*.la' -exec rm -f {} ';' @@ -354,7 +329,6 @@ cp -a ./%{_libdir}/libfm/modules/gtk/ \ $RPM_BUILD_ROOT%{_libdir}/libfm/modules/ popd %endif -%endif /usr/lib/rpm/check-rpaths @@ -365,9 +339,7 @@ cd libfm find INSTDIR-gtk* -name \*.ui >> po/POTFILES.skip for ver in \ -%if 0%{?fedora} >= 22 2 \ -%endif 3 \ %{nil} do @@ -389,9 +361,10 @@ fi %endif # FIXME: Add ChangeLog if not empty %doc AUTHORS -%doc COPYING +%license COPYING %doc NEWS %doc README + %if ! 0%{?bootstrap} %dir %{_sysconfdir}/xdg/libfm/ %config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf @@ -407,11 +380,7 @@ fi %if ! 0%{?bootstrap} %files gtk %{_libdir}/%{name}-gtk3.so.4* -%if 0%{?fedora} < 22 -%{_libdir}/libfm/modules/gtk-*.so -%else %{_libdir}/libfm/modules/gtk3/ -%endif %files gtk-utils %{_mandir}/man1/libfm-pref-apps.1.* @@ -441,7 +410,6 @@ fi %{_libdir}/%{name}-gtk3.so %{_libdir}/pkgconfig/libfm-gtk3.pc -%if 0%{?fedora} >= 22 %files gtk2 %{_libdir}/%{name}-gtk.so.4* %{_libdir}/libfm/modules/gtk/ @@ -449,7 +417,6 @@ fi %files gtk2-devel %{_libdir}/%{name}-gtk.so %{_libdir}/pkgconfig/libfm-gtk.pc -%endif %if 0%{?build_doc} %files devel-docs @@ -460,6 +427,9 @@ fi %endif %changelog +* Wed Apr 8 2020 Mamoru TASAKA - 1.3.1-2.D20200401git8914a52 +- Update to the latest git + * Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 90bc890..aadcaba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-1.3.1.tar.xz) = f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 +SHA512 (libfm-20200407T1514.tar.gz) = ed9791bb507fb211d2ce4f2adf8d36ecf996ab12e0e525c3049c095f123b0ea5105d91f6f3ca38ef787797af395005c3b56752e2bd8aa34aca1bff5381f67ace From 58df31e91d8d5b0a14370c37b3cafff32876b456 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Apr 2020 14:47:04 +0900 Subject: [PATCH 07/51] kill extra dist for future --- libfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index a4475e3..0bf43b9 100644 --- a/libfm.spec +++ b/libfm.spec @@ -31,7 +31,7 @@ %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit}%{?dist} +%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} %endif %global build_doc 1 From 1e460b732a8320115c0f775489a535a172a51326 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:39:26 +0000 Subject: [PATCH 08/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 0bf43b9..7a781f1 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -427,6 +427,9 @@ fi %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.1-2.D20200401git8914a52.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Apr 8 2020 Mamoru TASAKA - 1.3.1-2.D20200401git8914a52 - Update to the latest git From 1d92db2adbebb17b2aa4042b8adff5f8a75f65ce Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 01:13:10 +0000 Subject: [PATCH 09/51] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libfm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libfm.spec b/libfm.spec index 7a781f1..1622303 100644 --- a/libfm.spec +++ b/libfm.spec @@ -58,6 +58,7 @@ Source10: create-libfm-git-bare-tarball.sh #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 +BuildRequires: make BuildRequires: libexif-devel BuildRequires: gtk3-devel BuildRequires: gtk2-devel From 20b5a4b114f5d7f9cfc7dbf59eda23dd9412921c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:04:34 +0000 Subject: [PATCH 10/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 1622303..53532a4 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -428,6 +428,9 @@ fi %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.1-2.D20200401git8914a52.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.1-2.D20200401git8914a52.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5191ede55477f0882045f6867fd6eb3f237ec673 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 1 Feb 2021 21:56:19 +0900 Subject: [PATCH 11/51] Update to the latest git --- .gitignore | 1 + create-libfm-git-bare-tarball.sh | 4 ++++ libfm.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4e01453..ecbdfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ libfm-0.1.12.tar.gz /libfm-1.3.0.2.tar.xz /libfm-1.3.1.tar.xz /libfm-20200407T1514.tar.gz +/libfm-20210201T2130.tar.gz diff --git a/create-libfm-git-bare-tarball.sh b/create-libfm-git-bare-tarball.sh index 9af078b..1095278 100644 --- a/create-libfm-git-bare-tarball.sh +++ b/create-libfm-git-bare-tarball.sh @@ -18,6 +18,10 @@ pushd $TMPDIR git clone --mirror $GITURL tar czf ${TARNAME} ${REPONAME}.git/ +pushd ${REPONAME}.git/ +git log --format=fuller | head -n 12 +popd + cp -p ${TARNAME} $PWDDIR popd rm -rf $TMPDIR diff --git a/libfm.spec b/libfm.spec index 53532a4..a943815 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,15 +16,15 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 3 %if 0%{?usegitbare} >= 1 -%global gitcommit 8914a52b0916fde8ac5d3cfc9a35ed553a1e089f -%global gitdate 20200401 +%global gitcommit 1d799677edce7be1ae6d63b1602d74981e2175e4 +%global gitdate 20210129 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20200407 -%global tarballtime 1514 +%global tarballdate 20210201 +%global tarballtime 2130 %endif %if 0%{?userelease} >= 1 @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -428,6 +428,9 @@ fi %endif %changelog +* Mon Feb 1 2021 Mamoru TASAKA - 1.3.1-3.D20210129git1d79967 +- Update to the latest git + * Tue Jan 26 2021 Fedora Release Engineering - 1.3.1-2.D20200401git8914a52.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index aadcaba..bec5ed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20200407T1514.tar.gz) = ed9791bb507fb211d2ce4f2adf8d36ecf996ab12e0e525c3049c095f123b0ea5105d91f6f3ca38ef787797af395005c3b56752e2bd8aa34aca1bff5381f67ace +SHA512 (libfm-20210201T2130.tar.gz) = 539d14eb9b1f4df31108028126237896ccea4426b1e8901e9313fa211f2d82f6137a7d77a5c4105021186b85a7010141958fe4099c83a9fc883465b5bf19d286 From 6e5fbae584192bf93410ac80090283280aa28904 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Feb 2021 16:19:03 +0900 Subject: [PATCH 12/51] Update to the latest git --- .gitignore | 1 + libfm.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ecbdfa3..1afa511 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ libfm-0.1.12.tar.gz /libfm-1.3.1.tar.xz /libfm-20200407T1514.tar.gz /libfm-20210201T2130.tar.gz +/libfm-20210204T1524.tar.gz diff --git a/libfm.spec b/libfm.spec index a943815..90ce361 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,15 +16,15 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 3 +%global mainrel 4 %if 0%{?usegitbare} >= 1 -%global gitcommit 1d799677edce7be1ae6d63b1602d74981e2175e4 -%global gitdate 20210129 +%global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 +%global gitdate 20210202 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210201 -%global tarballtime 2130 +%global tarballdate 20210204 +%global tarballtime 1524 %endif %if 0%{?userelease} >= 1 @@ -428,6 +428,9 @@ fi %endif %changelog +* Thu Feb 4 2021 Mamoru TASAKA - 1.3.1-4.D20210202git54cd5fc +- Update to the latest git + * Mon Feb 1 2021 Mamoru TASAKA - 1.3.1-3.D20210129git1d79967 - Update to the latest git diff --git a/sources b/sources index bec5ed0..81830e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20210201T2130.tar.gz) = 539d14eb9b1f4df31108028126237896ccea4426b1e8901e9313fa211f2d82f6137a7d77a5c4105021186b85a7010141958fe4099c83a9fc883465b5bf19d286 +SHA512 (libfm-20210204T1524.tar.gz) = 98d72fe3c25800f89d58731f0b9ca02712794a924714f7625c312392362b60b79c50dfa41498b72b5bb73948bb7e38f542f6f453180ba0c29ee2d44a238f8dfa From d5b2a7f7f4440e39996641fae96dbb0e223968c8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 7 Feb 2021 15:30:25 +0900 Subject: [PATCH 13/51] 1.3.2 release --- .gitignore | 1 + libfm.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1afa511..e79c0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ libfm-0.1.12.tar.gz /libfm-20200407T1514.tar.gz /libfm-20210201T2130.tar.gz /libfm-20210204T1524.tar.gz +/libfm-1.3.2.tar.xz diff --git a/libfm.spec b/libfm.spec index 90ce361..9f86b9f 100644 --- a/libfm.spec +++ b/libfm.spec @@ -3,8 +3,8 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm # add bootstrap, need to build menu-cache in epel7 -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force @@ -12,11 +12,11 @@ %endif %global bootstrap 0 -%global mainver 1.3.1 +%global mainver 1.3.2 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 4 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -428,6 +428,9 @@ fi %endif %changelog +* Sun Feb 7 2021 Mamoru TASAKA - 1.3.2-1 +- 1.3.2 release + * Thu Feb 4 2021 Mamoru TASAKA - 1.3.1-4.D20210202git54cd5fc - Update to the latest git diff --git a/sources b/sources index 81830e3..803f17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20210204T1524.tar.gz) = 98d72fe3c25800f89d58731f0b9ca02712794a924714f7625c312392362b60b79c50dfa41498b72b5bb73948bb7e38f542f6f453180ba0c29ee2d44a238f8dfa +SHA512 (libfm-1.3.2.tar.xz) = eaa3358cd1d8f611f8f4ac882e01a716b4dc32729b641417e1100aa039db3c57ae57ccc45df7dcac4f0570cd88684beba7752a5586c1d0598b1bc7502e99f4be From 29e5914f69ce561f845cf0ea62385a971de5e60b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:23:16 +0000 Subject: [PATCH 14/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 9f86b9f..b872945 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -428,6 +428,9 @@ fi %endif %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 e99c3cf88e959ab6f73e81fb4f32a36cbc0af1cf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Oct 2021 21:16:48 +0900 Subject: [PATCH 15/51] a bit of spec file cleanup --- libfm.spec | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/libfm.spec b/libfm.spec index b872945..d582922 100644 --- a/libfm.spec +++ b/libfm.spec @@ -58,25 +58,28 @@ Source10: create-libfm-git-bare-tarball.sh #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 -BuildRequires: make -BuildRequires: libexif-devel -BuildRequires: gtk3-devel -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.26.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.27.0 +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(libexif) %if ! 0%{?bootstrap} -BuildRequires: menu-cache-devel >= 0.3.2 +BuildRequires: pkgconfig(libmenu-cache) >= 0.3.2 %endif +BuildRequires: make +BuildRequires: gcc BuildRequires: gettext BuildRequires: intltool BuildRequires: desktop-file-utils BuildRequires: gtk-doc BuildRequires: libxslt - -BuildRequires: dbus-glib-devel - -BuildRequires: vala +BuildRequires: %{_bindir}/valac # Patch1000 needs the below anyway BuildRequires: automake @@ -212,7 +215,7 @@ do done %endif -%patch1000 -p1 +%patch1000 -p1 -Z %if 0%{?usegitbare} >= 1 git commit -m "Use gtk version specific module directory" -a %endif @@ -266,7 +269,7 @@ do make -C po -j1 GMSGFMT="msgfmt --statistics" make %{?_smp_mflags} -k - make install DESTDIR=$(pwd)/../INSTDIR-gtk${ver} + make install DESTDIR=$(pwd)/../INSTDIR-gtk${ver} INSTALL="install -p" popd done @@ -369,13 +372,16 @@ fi %if ! 0%{?bootstrap} %dir %{_sysconfdir}/xdg/libfm/ %config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf + %{_datadir}/%{name}/ %{_libdir}/%{name}.so.4* + %dir %{_libdir}/libfm %dir %{_libdir}/libfm/modules %{_libdir}/libfm/modules/vfs-*.so %{_datadir}/mime/packages/libfm.xml %endif + %{_libdir}/%{name}-extra.so.4* %if ! 0%{?bootstrap} @@ -386,6 +392,7 @@ fi %files gtk-utils %{_mandir}/man1/libfm-pref-apps.1.* %{_mandir}/man1/lxshortcut.1.* + %{_bindir}/libfm-pref-apps %{_bindir}/lxshortcut %{_datadir}/applications/libfm-pref-apps.desktop @@ -396,6 +403,7 @@ fi %doc TODO %{_includedir}/libfm %dir %{_includedir}/libfm-1.0/ + %if ! 0%{?bootstrap} %{_libdir}/%{name}.so %{_libdir}/pkgconfig/libfm.pc From 41ea6a993625d6efcb470edfca116ee5f613d95f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Oct 2021 21:48:33 +0900 Subject: [PATCH 16/51] use git anyway --- libfm.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libfm.spec b/libfm.spec index d582922..76c2c73 100644 --- a/libfm.spec +++ b/libfm.spec @@ -85,9 +85,8 @@ BuildRequires: %{_bindir}/valac BuildRequires: automake BuildRequires: libtool -%if 0%{?usegitbare} >= 1 +# Anyway use git BuildRequires: git -%endif %if 0%{?build_doc} < 1 Obsoletes: %{name}-devel-docs < 0.1.15 @@ -193,6 +192,7 @@ This package containg development documentation files for %{name}. %setup -q -n %{name}-%{version}%{?prever} cp -a %{SOURCE1} . #%%patch0 -p1 -b .orig +git init %endif %if 0%{?usegitbare} >= 1 @@ -200,10 +200,19 @@ cp -a %{SOURCE1} . git clone ./libfm.git/ cd libfm cp -a [A-Z]* .. +%endif git config user.name "libfm Fedora maintainer" git config user.email "libfm-maintainer@fedoraproject.org" +%if 0%{?userelease} >= 1 +# Once call autogen.sh to make git status clean +sh autogen.sh +git add . +git commit -m "Init tree" -q +%endif + +%if 0%{?usegitbare} >= 1 git checkout -b %{version}-fedora %{gitcommit} cat > GITHASH <= 1 -git commit -m "Use gtk version specific module directory" -a -%endif - -# Patch1000 needs below anyway +# Patch1000 needs below sh autogen.sh +git commit -m "Use gtk version specific module directory" -a + # treak rpath sed -i.libdir_syssearch \ -e '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \ configure +git commit -m "Tweak library search path spec not to inject rpath" -a %build %if 0%{?usegitbare} >= 1 From 36cd0c8a49cfc151d9c5a54ddea038bdaf7d71c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Oct 2021 14:45:48 +0900 Subject: [PATCH 17/51] Make fm_config_load_from_key_file don't replace string key value when subsequent config file does not contain such key but previous key had (related to bug 2011471) --- ...rom_key_file-don-t-replace-string-va.patch | 91 +++++++++++++++++++ libfm.spec | 14 ++- 2 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch diff --git a/libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch b/libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch new file mode 100644 index 0000000..493abf9 --- /dev/null +++ b/libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch @@ -0,0 +1,91 @@ +From 1789c96ae73720ef001249d2085553102043aee3 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Thu, 28 Oct 2021 22:07:14 +0900 +Subject: [PATCH] fm_config_load_from_key_file: don't replace string value when + loaded config file does not have such key + +For example, fm_config_load_from_file() loads every key file with path +ending with "/libfm/libfm.conf" under XDG_CONFIG_DIRS using fm_config_load_from_key_file(). + +With current fm_config_load_from_key_file() implementation, every time it is called, +for key having string, firstly the old value is always free'ed, and the new value is +read and set, even if the new value is empty. +So if system wide key file contains a key with string value but user-specific key file +does not contain the key, system widely set key value is lost, which is unwilling. + +For other value types (such as bool or int), the corresponding fm_key_file_get_TYPE +function are used, and these functions replace old values when the new config file +actually has the corresponding key. + +With this patch, similar to other value types, string value is to be replaced +only when new loaded config actually has corresponding key. +Also, implement fm_key_file_get_string() to be consistent with other types. +--- + src/base/fm-config.c | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/src/base/fm-config.c b/src/base/fm-config.c +index a633857..1e3d3f7 100644 +--- a/src/base/fm-config.c ++++ b/src/base/fm-config.c +@@ -245,6 +245,19 @@ static void _parse_drop_default_action(GKeyFile *kf, gint *action) + } + } + ++static gboolean fm_key_file_get_string(GKeyFile* kf, const char* grp, const char* key, char** val) ++{ ++ char* str_key_new = g_key_file_get_string(kf, grp, key, NULL); ++ if(G_LIKELY(str_key_new)) ++ { ++ if (*val) ++ g_free(*val); ++ *val = str_key_new; ++ } ++ return str_key_new != NULL; ++} ++ ++ + /** + * fm_config_load_from_key_file + * @cfg: pointer to configuration +@@ -263,12 +276,8 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) + fm_key_file_get_int(kf, "config", "auto_selection_delay", &cfg->auto_selection_delay); + fm_key_file_get_bool(kf, "config", "confirm_del", &cfg->confirm_del); + fm_key_file_get_bool(kf, "config", "confirm_trash", &cfg->confirm_trash); +- if(cfg->terminal) +- g_free(cfg->terminal); +- cfg->terminal = g_key_file_get_string(kf, "config", "terminal", NULL); +- if(cfg->archiver) +- g_free(cfg->archiver); +- cfg->archiver = g_key_file_get_string(kf, "config", "archiver", NULL); ++ fm_key_file_get_string(kf, "config", "terminal", &cfg->terminal); ++ fm_key_file_get_string(kf, "config", "archiver", &cfg->archiver); + fm_key_file_get_bool(kf, "config", "thumbnail_local", &cfg->thumbnail_local); + fm_key_file_get_int(kf, "config", "thumbnail_max", &cfg->thumbnail_max); + fm_key_file_get_bool(kf, "config", "advanced_mode", &cfg->advanced_mode); +@@ -285,8 +294,7 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) + fm_key_file_get_bool(kf, "config", "defer_content_test", &cfg->defer_content_test); + fm_key_file_get_bool(kf, "config", "quick_exec", &cfg->quick_exec); + fm_key_file_get_bool(kf, "config", "smart_desktop_autodrop", &cfg->smart_desktop_autodrop); +- g_free(cfg->format_cmd); +- cfg->format_cmd = g_key_file_get_string(kf, "config", "format_cmd", NULL); ++ fm_key_file_get_string(kf, "config", "format_cmd", &cfg->format_cmd); + /* append blacklist */ + strv = g_key_file_get_string_list(kf, "config", "modules_blacklist", NULL, NULL); + fm_strcatv(&cfg->modules_blacklist, strv); +@@ -305,10 +313,8 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) + fm_key_file_get_int(kf, "ui", "thumbnail_size", &cfg->thumbnail_size); + fm_key_file_get_bool(kf, "ui", "show_thumbnail", &cfg->show_thumbnail); + fm_key_file_get_bool(kf, "ui", "shadow_hidden", &cfg->shadow_hidden); +- g_free(cfg->list_view_size_units); +- cfg->list_view_size_units = g_key_file_get_string(kf, "ui", "list_view_size_units", NULL); +- g_free(cfg->saved_search); +- cfg->saved_search = g_key_file_get_string(kf, "ui", "saved_search", NULL); ++ fm_key_file_get_string(kf, "ui", "list_view_size_units", &cfg->list_view_size_units); ++ fm_key_file_get_string(kf, "ui", "saved_search", &cfg->saved_search); + + fm_key_file_get_bool(kf, "places", "places_home", &cfg->places_home); + fm_key_file_get_bool(kf, "places", "places_desktop", &cfg->places_desktop); +-- +2.33.1 + diff --git a/libfm.spec b/libfm.spec index 76c2c73..1e6c384 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,7 +16,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -54,6 +54,10 @@ Source0: libfm-%{tarballdate}T%{tarballtime}.tar.gz %endif Source10: create-libfm-git-bare-tarball.sh +# Make fm_config_load_from_key_file don't replace string key value +# 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 # 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 @@ -224,6 +228,7 @@ do done %endif +cat %PATCH1 | git am %patch1000 -p1 -Z # Patch1000 needs below sh autogen.sh @@ -444,6 +449,11 @@ fi %endif %changelog +* Thu Oct 28 2021 Mamoru TASAKA - 1.3.2-2 +- Make fm_config_load_from_key_file don't replace string key value + when subsequent config file does not contain such key but previous key had + (related to bug 2011471) + * Thu Jul 22 2021 Fedora Release Engineering - 1.3.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4c92a4c501c4c2b5bf737816b04f321a886e9ce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:13:40 +0000 Subject: [PATCH 18/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 1e6c384..ab3ba0a 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -449,6 +449,9 @@ fi %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Oct 28 2021 Mamoru TASAKA - 1.3.2-2 - Make fm_config_load_from_key_file don't replace string key value when subsequent config file does not contain such key but previous key had From d2fb1c9997fd6adde1995b2e5f0ce7194aef856d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:48:59 +0000 Subject: [PATCH 19/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index ab3ba0a..60b87ab 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -449,6 +449,9 @@ fi %endif %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.3.2-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.3.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d655de6001e7eb71abddcd4af5acdb985d05e046 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:20:26 +0000 Subject: [PATCH 20/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 60b87ab..77cd5ed 100644 --- a/libfm.spec +++ b/libfm.spec @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: GIO-based library for file manager-like programs License: GPLv2+ @@ -449,6 +449,9 @@ fi %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-2.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.3.2-2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 413f45c49ffd21a34a31265b29ee1ec2e2e2999f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:11:59 +0900 Subject: [PATCH 21/51] rename release macro to make rpmdev-bumprelease work --- libfm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libfm.spec b/libfm.spec index 77cd5ed..96ac700 100644 --- a/libfm.spec +++ b/libfm.spec @@ -28,10 +28,10 @@ %endif %if 0%{?userelease} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +%global baserelease %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} %endif %global build_doc 1 @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{fedorarel}%{?dist}.3 +Release: %{baserelease}%{?dist}.3 Summary: GIO-based library for file manager-like programs License: GPLv2+ From 5ebd9fc8fb4cd73f6da12eee630ed3cf657f34db Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:25:09 +0900 Subject: [PATCH 22/51] fix baserelease usage --- libfm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libfm.spec b/libfm.spec index 96ac700..f96b6a0 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,7 +16,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global baserelease 2 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -28,10 +28,10 @@ %endif %if 0%{?userelease} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global baserelease %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +%global fedorarel %{?prever:0.}%{baserelease}.D%{gitdate}git%{shortcommit} %endif %global build_doc 1 @@ -40,7 +40,7 @@ Name: libfm Version: %{mainver} -Release: %{baserelease}%{?dist}.3 +Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs License: GPLv2+ From a996d8ac658f33658f851f5d7d291afd064e801e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:52:00 +0000 Subject: [PATCH 23/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index f96b6a0..925ff03 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,7 +16,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 2 +%global baserelease 3 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -449,6 +449,9 @@ fi %endif %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-2.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 24413512a769e90b39e042cd8b42cdc25e017096 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Dec 2023 21:04:54 +0900 Subject: [PATCH 24/51] SPDX migration --- libfm.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libfm.spec b/libfm.spec index 925ff03..40e5a2b 100644 --- a/libfm.spec +++ b/libfm.spec @@ -16,7 +16,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 4 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -43,7 +43,24 @@ Version: %{mainver} Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs -License: GPLv2+ +# src/actions/ GPL-2.0-or-later +# src/base/ LGPL-2.1-or-later +# src/demo/ GPL-2.0-or-later +# src/extra/ LGPL-2.1-or-later +# src/fm-gtk.{c,h} GPL-2.0-or-later +# src/gtk-compat.c GPL-2.0-or-later +# src/*.c (rest) LGPL-2.1-or-later +# src/gio/ GPL-2.0-or-later +# src/gtk/exo/ LGPL-2.1-or-later AND GPL-2.0-or-later +# src/gtk/ GPL-2.0-or-later AND LGPL-2.1-or-later +# src/job/ LGPL-2.1-or-later +# src/modules/ GPL-2.0-or-later +# src/tests/ GPL-2.0-or-later +# src/tools/ GPL-2.0-or-later +# src/udisks/ GPL-2.0-or-later + +# SPDX confirmed +License: LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://pcmanfm.sourceforge.net/ %if 0%{?userelease} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz @@ -229,7 +246,7 @@ done %endif cat %PATCH1 | git am -%patch1000 -p1 -Z +%patch -P1000 -p1 -Z # Patch1000 needs below sh autogen.sh git commit -m "Use gtk version specific module directory" -a @@ -449,6 +466,9 @@ fi %endif %changelog +* Mon Dec 11 2023 Mamoru TASAKA - 1.3.2-4 +- SPDX migration + * Thu Jul 20 2023 Fedora Release Engineering - 1.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 67c7e9518bbf96f1a41880163bae235443b459b5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Jan 2024 10:27:53 +0900 Subject: [PATCH 25/51] Change -Wincompatible-pointer-types from error to warning --- libfm.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 40e5a2b..d33ad12 100644 --- a/libfm.spec +++ b/libfm.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + # Review: https://bugzilla.redhat.com/show_bug.cgi?id=567257 # Upstream git: @@ -16,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 4 +%global baserelease 5 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -466,6 +469,9 @@ fi %endif %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 1.3.2-5 +- Change -Wincompatible-pointer-types from error to warning + * Mon Dec 11 2023 Mamoru TASAKA - 1.3.2-4 - SPDX migration From fc6f3ba65f669f060f5433b7228f25de3367b21e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:05:26 +0000 Subject: [PATCH 26/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index d33ad12..684e032 100644 --- a/libfm.spec +++ b/libfm.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 5 +%global baserelease 6 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -469,6 +469,9 @@ fi %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 1.3.2-5 - Change -Wincompatible-pointer-types from error to warning From 2e4ec8cd873de0d81e1f046f40424f1b01197cea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:10:08 +0000 Subject: [PATCH 27/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libfm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 684e032..bddb04d 100644 --- a/libfm.spec +++ b/libfm.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 6 +%global baserelease 7 %if 0%{?usegitbare} >= 1 %global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 @@ -469,6 +469,9 @@ fi %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cfa79c87aa34b09351c20ec804e1f6d83edbb811 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 27 Feb 2024 15:29:11 +0900 Subject: [PATCH 28/51] Handle gcc14 -Werror=incompatible-pointer-types Make vala regenerate C source related to -Werror=incompatible-pointer-types workaround for vala source --- ...14-Werror-incompatible-pointer-types.patch | 56 +++++++++++++++++ libfm.spec | 60 +++++++++++-------- 2 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch diff --git a/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch b/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch new file mode 100644 index 0000000..7389021 --- /dev/null +++ b/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch @@ -0,0 +1,56 @@ +From a86353b8ef8ddd5c8a8a0de9b00a103e8f5e5c52 Mon Sep 17 00:00:00 2001 +From: libfm Fedora maintainer +Date: Fri, 23 Feb 2024 14:56:20 +0900 +Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +To support this, cast GTK related objects for assignment +properly. +--- + src/gtk/exo/exo-icon-view.c | 2 +- + src/gtk/fm-dnd-dest.c | 2 +- + src/gtk/fm-standard-view.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c +index 3ce9809..79e1c7a 100644 +--- a/src/gtk/exo/exo-icon-view.c ++++ b/src/gtk/exo/exo-icon-view.c +@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))); ++ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c +index 95d310d..ce75275 100644 +--- a/src/gtk/fm-dnd-dest.c ++++ b/src/gtk/fm-dnd-dest.c +@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, + gtk_action_set_sensitive(act, FALSE); + } + } +- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); ++ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); + g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); + unmap_handler = g_signal_connect(ri.menu, "unmap", + G_CALLBACK(run_unmap_handler), &ri); +diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c +index e0ff5a0..df92025 100644 +--- a/src/gtk/fm-standard-view.c ++++ b/src/gtk/fm-standard-view.c +@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) + "text", FM_FOLDER_MODEL_COL_NAME ); + if(fv->renderer_text) + g_object_unref(fv->renderer_text); +- fv->renderer_text = g_object_ref_sink(render); ++ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); + exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); + g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); + g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); +-- +2.43.2 + diff --git a/libfm.spec b/libfm.spec index bddb04d..dd8fb48 100644 --- a/libfm.spec +++ b/libfm.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - # Review: https://bugzilla.redhat.com/show_bug.cgi?id=567257 # Upstream git: @@ -14,36 +11,36 @@ %global userelease 1 %endif -%global bootstrap 0 +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + %global mainver 1.3.2 -%undefine prever -%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 7 +%if 0%{?use_gitbare} +%global gittardate 20210204 +%global gittartime 1524 -%if 0%{?usegitbare} >= 1 -%global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 -%global gitdate 20210202 -%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) +%global gitbaredate 20210202 +%global git_rev 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} -%global tarballdate 20210204 -%global tarballtime 1524 +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} %endif -%if 0%{?userelease} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}.D%{gitdate}git%{shortcommit} -%endif +%global main_version 1.3.2 + +%global bootstrap 0 %global build_doc 1 %undefine _changelog_trimtime Name: libfm -Version: %{mainver} -Release: %{fedorarel}%{?dist} +Version: %{main_version}%{git_ver_rpm} +Release: 8%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -78,6 +75,8 @@ 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 +# Support gcc14 -Werror=incompatible-pointer-types +Patch2: libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.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 @@ -213,16 +212,16 @@ This package containg development documentation files for %{name}. %prep %if 0%{?userelease} >= 1 -%setup -q -n %{name}-%{version}%{?prever} +%setup -q -n %{name}-%{main_version}%{?prever} cp -a %{SOURCE1} . #%%patch0 -p1 -b .orig git init %endif -%if 0%{?usegitbare} >= 1 -%setup -q -c -T -a 0 -git clone ./libfm.git/ -cd libfm +%if 0%{?use_gitbare} +%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 +git clone ./%{name}.git/ +cd %{name} cp -a [A-Z]* .. %endif @@ -249,6 +248,7 @@ done %endif cat %PATCH1 | git am +cat %PATCH2 | git am %patch -P1000 -p1 -Z # Patch1000 needs below sh autogen.sh @@ -261,6 +261,9 @@ sed -i.libdir_syssearch \ configure git commit -m "Tweak library search path spec not to inject rpath" -a +# Tell vala to regenerate C source +find . -name \*.vala | xargs touch + %build %if 0%{?usegitbare} >= 1 cd libfm @@ -469,6 +472,11 @@ fi %endif %changelog +* Fri Feb 23 2024 Mamoru TASAKA - 1.3.2-8 +- Handle gcc14 -Werror=incompatible-pointer-types +- Make vala regenerate C source related to -Werror=incompatible-pointer-types + workaround for vala source + * Thu Jan 25 2024 Fedora Release Engineering - 1.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5043da67fd854eb0c28fd5ca841f600dbb1f76bb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 27 Feb 2024 16:24:00 +0900 Subject: [PATCH 29/51] Update to the latest git (20230916git5346a539) --- .gitignore | 49 +------------------ libfm-1.3.0.2-moduledir-gtkspecific-v03.patch | 4 +- libfm.spec | 47 +++++++++--------- sources | 2 +- 4 files changed, 30 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index e79c0ce..b334c15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,2 @@ -libfm-0.1.12.tar.gz -/libfm-0.1.14.tar.gz -/libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz -/libfm-0.1.15-git197c7e1b8e3e439a5e4f3f004a3447aef43b298b.tar.gz -/libfm-0.1.15-gitdebea4a90d17ec6fd5876564d28977a3c3875924.tar.gz -/libfm-0.1.15-D20110422git30d03d27e4.tar.gz -/libfm-0.1.15-D20110427gita1f63c3114.tar.gz -/libfm-0.1.15-D20110529gitcd79d6228b.tar.gz -/libfm-0.1.15-D20110807gitd22b41fd2f.tar.gz -/libfm-0.1.16.tar.gz -/libfm-0.1.17.tar.gz -/libfm-1.0.tar.gz -/libfm-1.0.1.tar.gz -/libfm-1.1.0.tar.gz -/libfm-1.1.1.tar.gz -/libfm-1.1.2.tar.gz -/libfm-1.1.2.1.tar.gz -/libfm-1.1.2.2.tar.gz -/libfm-1.1.3.tar.xz -/libfm-1.1.4.tar.xz -/libfm-1.2.0-rc1.tar.xz -/libfm-1.2.0.tar.xz -/libfm-1.2.1.tar.xz -/libfm-1.2.2.tar.xz -/libfm-1.2.3.tar.xz -/libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz -/libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz -/libfm-1.2.3-D20150525git8f38f90e04b648637509f2fa2d4208027ae59b5c.tar.gz -/libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz -/libfm-1.2.3-D20150713gitf47c9ae7ae7e1c5ff9742b8a6ca49fdb6f55f98d.tar.gz -/libfm-1.2.3-D20150728git47d0c1dd7d59c83188f11bfd6aef4a855f4f5c39.tar.gz -/libfm-1.2.4.tar.xz -/libfm-1.2.4-D20160618gitb22c0995e76936d62e246a12e5a0cf0ccf31361e.tar.gz -/libfm-1.2.4-D20160627git2a537414def87ebd75024a74030e60582cd78c45.tar.gz -/libfm-1.2.4-D20161017git82b3a1a201aae22860f501e3f7e75b46f8bcacd7.tar.gz -/libfm-1.2.4-D20161105gitc2989af0154256c35c5def4b9f5a758c8a3878ca.tar.gz -/libfm-1.2.4-D20161204git275559f196db6340d4ae6119a10d9b0efedaf84f.tar.gz -/libfm-1.2.4-D20161206gita24389f804ae95f737bbb4239be00bc99a62180b.tar.gz -/libfm-1.2.4-D20161209gitab583d7800bbc308f2852384f87c2357f49b01cd.tar.gz -/libfm-1.2.5.tar.xz -/libfm-20171230T1949.tar.gz -/libfm-1.3.0.2.tar.xz -/libfm-1.3.1.tar.xz -/libfm-20200407T1514.tar.gz -/libfm-20210201T2130.tar.gz -/libfm-20210204T1524.tar.gz -/libfm-1.3.2.tar.xz +/libfm-*.tar.gz +/libfm-*.tar.xz diff --git a/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch b/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch index b70a7e5..d240e49 100644 --- a/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch +++ b/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch @@ -22,8 +22,8 @@ + LIBFM_GTK_MODULE_DIR_SUFFIX="" LIBFM_PREF_APPS= fi - AC_SUBST(GTK_CFLAGS) -@@ -141,6 +144,7 @@ AC_SUBST(GTK_LIBS) + if test "$ac_with_gtk" = "3.0"; then +@@ -144,6 +147,7 @@ AC_SUBST(GTK_LIBS) AC_SUBST(LIBFM_GTK_LTLIBRARIES) AC_SUBST(LIBFM_PREF_APPS) AC_SUBST(LIBFM_GTK_PC) diff --git a/libfm.spec b/libfm.spec index dd8fb48..0caf0fd 100644 --- a/libfm.spec +++ b/libfm.spec @@ -3,26 +3,26 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm # add bootstrap, need to build menu-cache in epel7 -%global userelease 1 -%global usegitbare 0 +%global use_release 0 +%global use_gitbare 1 -%if 0%{?usegitbare} < 1 +%if 0%{?use_gitbare} < 1 # force -%global userelease 1 +%global use_release 0 %endif %global git_version %{nil} %global git_ver_rpm %{nil} %global git_builddir %{nil} -%global mainver 1.3.2 +%global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20210204 -%global gittartime 1524 +%global gittardate 20240227 +%global gittartime 1529 -%global gitbaredate 20210202 -%global git_rev 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 +%global gitbaredate 20230916 +%global git_rev 5346a5390a0881d5713a71e15f371132680056ee %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: 8%{?dist} +Release: 1%{?dist} Summary: GIO-based library for file manager-like programs # src/actions/ GPL-2.0-or-later @@ -62,12 +62,12 @@ Summary: GIO-based library for file manager-like programs # SPDX confirmed License: LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://pcmanfm.sourceforge.net/ -%if 0%{?userelease} >= 1 +%if 0%{?use_release} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz Source1: https://raw.githubusercontent.com/lxde/libfm/master/autogen.sh %endif -%if 0%{?usegitbare} >= 1 -Source0: libfm-%{tarballdate}T%{tarballtime}.tar.gz +%if 0%{?use_gitbare} >= 1 +Source0: libfm-%{gittardate}T%{gittartime}.tar.gz %endif Source10: create-libfm-git-bare-tarball.sh @@ -211,7 +211,7 @@ This package containg development documentation files for %{name}. %prep -%if 0%{?userelease} >= 1 +%if 0%{?use_release} >= 1 %setup -q -n %{name}-%{main_version}%{?prever} cp -a %{SOURCE1} . #%%patch0 -p1 -b .orig @@ -228,15 +228,15 @@ cp -a [A-Z]* .. git config user.name "libfm Fedora maintainer" git config user.email "libfm-maintainer@fedoraproject.org" -%if 0%{?userelease} >= 1 +%if 0%{?use_release} >= 1 # Once call autogen.sh to make git status clean sh autogen.sh git add . git commit -m "Init tree" -q %endif -%if 0%{?usegitbare} >= 1 -git checkout -b %{version}-fedora %{gitcommit} +%if 0%{?use_gitbare} >= 1 +git checkout -b %{main_version}-fedora %{git_rev} cat > GITHASH <= 1 +%if 0%{?use_gitbare} >= 1 cd libfm %endif -%if 0%{?usegitbare} >= 1 +%if 0%{?use_gitbare} >= 1 # Workaround # Once generate files anyway ./configure @@ -312,7 +312,7 @@ done %install TOPDIR=$(pwd) -%if 0%{?usegitbare} >= 1 +%if 0%{?use_gitbare} >= 1 cd libfm %endif @@ -373,7 +373,7 @@ popd /usr/lib/rpm/check-rpaths %check -%if 0%{?usegitbare} >= 1 +%if 0%{?use_gitbare} >= 1 cd libfm %endif @@ -472,6 +472,9 @@ fi %endif %changelog +* Tue Feb 27 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-1 +- Update to the latest git (20230916git5346a539) + * Fri Feb 23 2024 Mamoru TASAKA - 1.3.2-8 - Handle gcc14 -Werror=incompatible-pointer-types - Make vala regenerate C source related to -Werror=incompatible-pointer-types diff --git a/sources b/sources index 803f17a..06d4435 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-1.3.2.tar.xz) = eaa3358cd1d8f611f8f4ac882e01a716b4dc32729b641417e1100aa039db3c57ae57ccc45df7dcac4f0570cd88684beba7752a5586c1d0598b1bc7502e99f4be +SHA512 (libfm-20240227T1529.tar.gz) = 716cf3eccee621ba6fd53342db483c456d08e663fccb36e2528c482eae986ed4b76ef535e14824048b60f08b28e19b55fc6204ed1d012a38c6117cc858e5c438 From 6c04728e9bb1e2da3c12dca02a0af6016278ae6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Mar 2024 14:21:30 +0900 Subject: [PATCH 30/51] add notes --- libfm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libfm.spec b/libfm.spec index 0caf0fd..617f31b 100644 --- a/libfm.spec +++ b/libfm.spec @@ -76,6 +76,7 @@ Source10: create-libfm-git-bare-tarball.sh # (related to bug 2011471) Patch1: libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.patch # Support gcc14 -Werror=incompatible-pointer-types +# https://github.com/lxde/libfm/pull/101 Patch2: libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.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 From 04ed106f9b5186ae4eb304de9c5e816b4f8c540b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 May 2024 17:35:01 +0900 Subject: [PATCH 31/51] Restore timestamps for git ls files --- libfm.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index 617f31b..bac1d5a 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 @@ -223,6 +223,17 @@ git init %setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 git clone ./%{name}.git/ cd %{name} + +# 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 + cp -a [A-Z]* .. %endif @@ -473,6 +484,9 @@ fi %endif %changelog +* Tue May 14 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-2 +- Restore timestamps for git ls files + * Tue Feb 27 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-1 - Update to the latest git (20230916git5346a539) From a41a5219de07994adf6831386e4763d96814925d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Jun 2024 17:24:03 +0900 Subject: [PATCH 32/51] add missing percent --- libfm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfm.spec b/libfm.spec index bac1d5a..6b4fba5 100644 --- a/libfm.spec +++ b/libfm.spec @@ -369,7 +369,7 @@ done pushd INSTDIR-gtk2 find . -name '*.la' -exec rm -f {} ';' -rm -f .{_libdir}/pkgconfig/libfm-gtk3.pc +rm -f .%{_libdir}/pkgconfig/libfm-gtk3.pc diff -urNp .%{_includedir}/%{name}-1.0 $RPM_BUILD_ROOT%{_includedir}/%name-1.0 diff -urNp .%{_datadir}/%{name} $RPM_BUILD_ROOT/%{_datadir}/%{name} From ad54cbaac6b3bfee838777aee7d754d65400ef50 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Jun 2024 17:46:36 +0900 Subject: [PATCH 33/51] Ignore po/ directory make check error with autoconf 2.72 --- libfm.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libfm.spec b/libfm.spec index 6b4fba5..36338b0 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 @@ -273,6 +273,12 @@ sed -i.libdir_syssearch \ configure git commit -m "Tweak library search path spec not to inject rpath" -a || true +# Ignore po/ directory make check error +sed -i.error po/Makefile.in.in \ + -e '\@check@,\@fi@s|exit 1|exit 0|' +git commit -m "ignore po/ directory make check error" -a || true + + # Tell vala to regenerate C source find . -name \*.vala | xargs touch @@ -389,7 +395,6 @@ popd cd libfm %endif -find INSTDIR-gtk* -name \*.ui >> po/POTFILES.skip for ver in \ 2 \ 3 \ @@ -484,6 +489,9 @@ fi %endif %changelog +* Tue Jun 04 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-3 +- Ignore po/ directory make check error with autoconf 2.72 + * Tue May 14 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-2 - Restore timestamps for git ls files From 331076b2f5b44ee96bd33fcc28575e7e28667fc8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Jul 2024 12:25:09 +0900 Subject: [PATCH 34/51] 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 36338b0..ad679aa 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20240227 -%global gittartime 1529 +%global gittardate 20240718 +%global gittartime 1045 -%global gitbaredate 20230916 -%global git_rev 5346a5390a0881d5713a71e15f371132680056ee +%global gitbaredate 20240714 +%global git_rev ee33947ee71719e5750cbe832159a7ecc90e0add %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 @@ -489,6 +489,9 @@ fi %endif %changelog +* Thu Jul 18 2024 Mamoru TASAKA - 1.3.2^20240714gitee33947e-1 +- Update to the latest git (20240714gitee33947e) + * Tue Jun 04 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-3 - Ignore po/ directory make check error with autoconf 2.72 diff --git a/sources b/sources index 06d4435..ed4a9f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20240227T1529.tar.gz) = 716cf3eccee621ba6fd53342db483c456d08e663fccb36e2528c482eae986ed4b76ef535e14824048b60f08b28e19b55fc6204ed1d012a38c6117cc858e5c438 +SHA512 (libfm-20240718T1045.tar.gz) = 58470e49d3a47ac3951ba047d798d625d804777ff7b8ceb034e7ce231cdb85628e0ddfec959b008b86dc66c46b096f5ad975eb047b2de0e325f292a335d05a22 From fee91f19c3a96f12e174be02dca0238fa9e761a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Aug 2024 14:51:58 +0900 Subject: [PATCH 35/51] Update to the latest git --- ...14-Werror-incompatible-pointer-types.patch | 56 ------------------- libfm.spec | 15 +++-- sources | 2 +- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch diff --git a/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch b/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch deleted file mode 100644 index 7389021..0000000 --- a/libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a86353b8ef8ddd5c8a8a0de9b00a103e8f5e5c52 Mon Sep 17 00:00:00 2001 -From: libfm Fedora maintainer -Date: Fri, 23 Feb 2024 14:56:20 +0900 -Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types - -gcc14 now defaults to -Werror=incompatible-pointer-types . -To support this, cast GTK related objects for assignment -properly. ---- - src/gtk/exo/exo-icon-view.c | 2 +- - src/gtk/fm-dnd-dest.c | 2 +- - src/gtk/fm-standard-view.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c -index 3ce9809..79e1c7a 100644 ---- a/src/gtk/exo/exo-icon-view.c -+++ b/src/gtk/exo/exo-icon-view.c -@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, - /* allocate a new event to forward */ - new_event = gdk_event_copy ((GdkEvent *) event); - g_object_unref (G_OBJECT (new_event->key.window)); -- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))); -+ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); - - /* send the event to the search entry. If the "preedit-changed" signal is - * emitted during this event, priv->search_imcontext_changed will be set. -diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c -index 95d310d..ce75275 100644 ---- a/src/gtk/fm-dnd-dest.c -+++ b/src/gtk/fm-dnd-dest.c -@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, - gtk_action_set_sensitive(act, FALSE); - } - } -- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); -+ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); - g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); - unmap_handler = g_signal_connect(ri.menu, "unmap", - G_CALLBACK(run_unmap_handler), &ri); -diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c -index e0ff5a0..df92025 100644 ---- a/src/gtk/fm-standard-view.c -+++ b/src/gtk/fm-standard-view.c -@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) - "text", FM_FOLDER_MODEL_COL_NAME ); - if(fv->renderer_text) - g_object_unref(fv->renderer_text); -- fv->renderer_text = g_object_ref_sink(render); -+ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); - exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); - g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); - g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); --- -2.43.2 - diff --git a/libfm.spec b/libfm.spec index ad679aa..239e467 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20240718 -%global gittartime 1045 +%global gittardate 20240813 +%global gittartime 1440 -%global gitbaredate 20240714 -%global git_rev ee33947ee71719e5750cbe832159a7ecc90e0add +%global gitbaredate 20240812 +%global git_rev fbcd183335729fa3e8dd6a837c13a23ff3271000 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -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 -# Support gcc14 -Werror=incompatible-pointer-types -# https://github.com/lxde/libfm/pull/101 -Patch2: libfm-1.3.2-0002-FIX-support-gcc14-Werror-incompatible-pointer-types.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,7 +257,6 @@ done %endif cat %PATCH1 | git am -cat %PATCH2 | git am %patch -P1000 -p1 -Z # Patch1000 needs below sh autogen.sh @@ -489,6 +485,9 @@ fi %endif %changelog +* Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812gitfbcd1833-1 +- Update to the latest git + * Thu Jul 18 2024 Mamoru TASAKA - 1.3.2^20240714gitee33947e-1 - Update to the latest git (20240714gitee33947e) diff --git a/sources b/sources index ed4a9f2..be6f930 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20240718T1045.tar.gz) = 58470e49d3a47ac3951ba047d798d625d804777ff7b8ceb034e7ce231cdb85628e0ddfec959b008b86dc66c46b096f5ad975eb047b2de0e325f292a335d05a22 +SHA512 (libfm-20240813T1440.tar.gz) = a865bc79c87152743e11b6dc5929d8ce8fb265c214379a388ac03eb4c6d9ef8d038c9d866c478f3cc2b9e0c9052c5292a3626d45a472b3d235123d35c433b5ee From 944eebdf07846bb7a965822ae17970dcfb54f9e3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 16:46:10 +0900 Subject: [PATCH 36/51] Update to the latest git Update to the latest git Update to the latest git Update to the latest git Update to the latest git Update to the latest git Update to the latest git Update to the latest git 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 239e467..94b2bd0 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20240813 -%global gittartime 1440 +%global gittardate 20240825 +%global gittartime 1555 -%global gitbaredate 20240812 -%global git_rev fbcd183335729fa3e8dd6a837c13a23ff3271000 +%global gitbaredate 20240823 +%global git_rev 4d2f7b41407f769e2ef4df5e74e736921c90aa92 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -485,6 +485,9 @@ fi %endif %changelog +* Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240823git4d2f7b41-1 +- Update to the latest git + * Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812gitfbcd1833-1 - Update to the latest git diff --git a/sources b/sources index be6f930..bf5c92f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20240813T1440.tar.gz) = a865bc79c87152743e11b6dc5929d8ce8fb265c214379a388ac03eb4c6d9ef8d038c9d866c478f3cc2b9e0c9052c5292a3626d45a472b3d235123d35c433b5ee +SHA512 (libfm-20240825T1555.tar.gz) = e70dcbba08b5927a37b0c17b1714593f6d8e370b7cb81bf3c94e3657b1bca1eb7e7b9483fa36d73bd1ba11aff1a9a9e13346a908c8cfd4e8ea682124338c2127 From cc7b8fca7b4e9623dc52dedbf0c1a3b453506e86 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 10 Nov 2024 16:25:35 +0900 Subject: [PATCH 37/51] Update to the latest git --- libfm.spec | 23 ++++++++++++++++------- sources | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/libfm.spec b/libfm.spec index 94b2bd0..3339a5f 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20240825 -%global gittartime 1555 +%global gittardate 20241110 +%global gittartime 1605 -%global gitbaredate 20240823 -%global git_rev 4d2f7b41407f769e2ef4df5e74e736921c90aa92 +%global gitbaredate 20241107 +%global git_rev d9935ec1d06f335c1a97fc0128c89a6af92a6d63 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -258,10 +258,16 @@ done cat %PATCH1 | git am %patch -P1000 -p1 -Z -# Patch1000 needs below -sh autogen.sh git commit -m "Use gtk version specific module directory" -a +# Need reporting upstream +# ref: https://github.com/lxde/libfm/commit/1af95bd8f26cab6848a74b7e02b53c6c79fb53a5 +sed -i Makefile.am \ + -e '\@docs/reference/libfm/libfm-sections.txt@d' +git commit -m "Remove files entry to be regenerated" -a || true + +sh autogen.sh +git commit -m "save modified files" -a || true # treak rpath sed -i.libdir_syssearch \ @@ -274,10 +280,10 @@ sed -i.error po/Makefile.in.in \ -e '\@check@,\@fi@s|exit 1|exit 0|' git commit -m "ignore po/ directory make check error" -a || true - # Tell vala to regenerate C source find . -name \*.vala | xargs touch + %build %if 0%{?use_gitbare} >= 1 cd libfm @@ -485,6 +491,9 @@ fi %endif %changelog +* Sun Nov 10 2024 Mamoru TASAKA - 1.3.2^20241107gitd9935ec1-1 +- Update to the latest git + * Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240823git4d2f7b41-1 - Update to the latest git diff --git a/sources b/sources index bf5c92f..6ec5343 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20240825T1555.tar.gz) = e70dcbba08b5927a37b0c17b1714593f6d8e370b7cb81bf3c94e3657b1bca1eb7e7b9483fa36d73bd1ba11aff1a9a9e13346a908c8cfd4e8ea682124338c2127 +SHA512 (libfm-20241110T1605.tar.gz) = 435fa35e1c3ab0762af999ca9286726eb0cc03f19dcfcbcec152199c96d72e1bba8174020c6bbd681249f60555c5dd2a42c3ae110ac620bb528cf60cd66b27f4 From e39844d7ed8c04207f60fea99f63066a35b4bf0f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 Dec 2024 11:15:50 +0900 Subject: [PATCH 38/51] 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 3339a5f..b0ef39b 100644 --- a/libfm.spec +++ b/libfm.spec @@ -8,7 +8,7 @@ %if 0%{?use_gitbare} < 1 # force -%global use_release 0 +%global use_release 1 %endif %global git_version %{nil} @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20241110 -%global gittartime 1605 +%global gittardate 20241206 +%global gittartime 1042 -%global gitbaredate 20241107 -%global git_rev d9935ec1d06f335c1a97fc0128c89a6af92a6d63 +%global gitbaredate 20241203 +%global git_rev cea660713e9ca9aa71fddcd818c6c4899ca7cc34 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -491,6 +491,9 @@ fi %endif %changelog +* Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203gitcea66071-1 +- Update to the latest git + * Sun Nov 10 2024 Mamoru TASAKA - 1.3.2^20241107gitd9935ec1-1 - Update to the latest git diff --git a/sources b/sources index 6ec5343..a3f5421 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20241110T1605.tar.gz) = 435fa35e1c3ab0762af999ca9286726eb0cc03f19dcfcbcec152199c96d72e1bba8174020c6bbd681249f60555c5dd2a42c3ae110ac620bb528cf60cd66b27f4 +SHA512 (libfm-20241206T1042.tar.gz) = d953a1e9997204973aa8ddc57e5e154b64c50ba7fba88c261a92ca89d8f20167f41fca7e1b1ed64f7da8cfebbaf107982a14ddcec6e964164321f449335e9324 From 796b8f4969e60ed76f964d2c6036aa8edbc1a0cb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Dec 2024 15:32:05 +0900 Subject: [PATCH 39/51] 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 b0ef39b..6af2a1c 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20241206 -%global gittartime 1042 +%global gittardate 20241219 +%global gittartime 1522 -%global gitbaredate 20241203 -%global git_rev cea660713e9ca9aa71fddcd818c6c4899ca7cc34 +%global gitbaredate 20241216 +%global git_rev fb651b87d2be140f0096458d51581faa1ebf86f4 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -491,6 +491,9 @@ fi %endif %changelog +* Thu Dec 19 2024 Mamoru TASAKA - 1.3.2^20241216gitfb651b87-1 +- Update to the latest git + * Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203gitcea66071-1 - Update to the latest git diff --git a/sources b/sources index a3f5421..803b03e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20241206T1042.tar.gz) = d953a1e9997204973aa8ddc57e5e154b64c50ba7fba88c261a92ca89d8f20167f41fca7e1b1ed64f7da8cfebbaf107982a14ddcec6e964164321f449335e9324 +SHA512 (libfm-20241219T1522.tar.gz) = 18d8712cabf6d58cb244df00f77410dea5da71f24c5329c6ba784f480003af4ecaf08b5d687a8873eeb9e17dd311c04f2e3f4092f7be057a7d26cf14a62af2be From aa6c3673fd47b26fc554788064d460c7094e3b05 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Dec 2024 17:43:56 +0900 Subject: [PATCH 40/51] Update to the latest git Restore libfm.so ABI (bug 2333955) --- libfm-pr105-Restore-ABI-for-libfm.so.patch | 78 ++++++++++++++++++++++ libfm.spec | 18 +++-- sources | 2 +- 3 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 libfm-pr105-Restore-ABI-for-libfm.so.patch diff --git a/libfm-pr105-Restore-ABI-for-libfm.so.patch b/libfm-pr105-Restore-ABI-for-libfm.so.patch new file mode 100644 index 0000000..52e762d --- /dev/null +++ b/libfm-pr105-Restore-ABI-for-libfm.so.patch @@ -0,0 +1,78 @@ +From e91fe2ee51832f82843768757cc02125ad17735d Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Wed, 25 Dec 2024 17:33:19 +0900 +Subject: [PATCH] Restore ABI for libfm.so + +The following 2 commit: +https://github.com/lxde/libfm/commit/b0545e0e7bd347dbb8001c153f8bd46718d0c852 +https://github.com/lxde/libfm/commit/2854a4ce01f1e2868f2fa2f453eca5fe3fd8339c +broke libfm.so ABI because this changed the size of `struct _FmConfig` . + +Restore libfm.so ABI compared to before. +Fixes #104 . +--- + src/base/fm-config.c | 7 +++++-- + src/base/fm-config.h | 8 +++----- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/base/fm-config.c b/src/base/fm-config.c +index c4a99019..ecb2db32 100644 +--- a/src/base/fm-config.c ++++ b/src/base/fm-config.c +@@ -260,10 +260,12 @@ static void _parse_drop_default_action(GKeyFile *kf, gint *action) + void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) + { + char **strv; ++ gboolean bool_val; + + fm_key_file_get_bool(kf, "config", "use_trash", &cfg->use_trash); + fm_key_file_get_bool(kf, "config", "single_click", &cfg->single_click); +- fm_key_file_get_bool(kf, "config", "middle_click", &cfg->middle_click); ++ fm_key_file_get_bool(kf, "config", "middle_click", &bool_val); ++ cfg->middle_click = bool_val; + if(cfg->single_click && cfg->middle_click) + cfg->middle_click = FALSE; + fm_key_file_get_int(kf, "config", "auto_selection_delay", &cfg->auto_selection_delay); +@@ -280,7 +282,8 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) + fm_key_file_get_bool(kf, "config", "advanced_mode", &cfg->advanced_mode); + fm_key_file_get_bool(kf, "config", "si_unit", &cfg->si_unit); + fm_key_file_get_bool(kf, "config", "force_startup_notify", &cfg->force_startup_notify); +- fm_key_file_get_bool(kf, "config", "date_iso_8601", &cfg->date_iso_8601); ++ fm_key_file_get_bool(kf, "config", "date_iso_8601", &bool_val); ++ cfg->date_iso_8601 = bool_val; + fm_key_file_get_bool(kf, "config", "backup_as_hidden", &cfg->backup_as_hidden); + fm_key_file_get_bool(kf, "config", "no_usb_trash", &cfg->no_usb_trash); + fm_key_file_get_bool(kf, "config", "no_child_non_expandable", &cfg->no_child_non_expandable); +diff --git a/src/base/fm-config.h b/src/base/fm-config.h +index 8e0b3eb8..48f397f2 100644 +--- a/src/base/fm-config.h ++++ b/src/base/fm-config.h +@@ -171,7 +171,6 @@ struct _FmConfig + gint drop_default_action; + + gboolean single_click; +- gboolean middle_click; + gboolean use_trash; + gboolean confirm_del; + gboolean confirm_trash; +@@ -181,7 +180,6 @@ struct _FmConfig + gboolean si_unit; + gboolean advanced_mode; + gboolean force_startup_notify; +- gboolean date_iso_8601; + gboolean backup_as_hidden; + gboolean no_usb_trash; + gboolean no_child_non_expandable; +@@ -215,9 +213,9 @@ struct _FmConfig + gboolean smart_desktop_autodrop; + gchar *saved_search; + /*< private >*/ +- gpointer _reserved1; /* reserved space for updates until next ABI */ +- gpointer _reserved2; +- gpointer _reserved3; ++ gintptr middle_click; ++ gintptr date_iso_8601; ++ gpointer _reserved3; /* reserved space for updates until next ABI */ + gpointer _reserved4; + gpointer _reserved5; + gpointer _reserved6; diff --git a/libfm.spec b/libfm.spec index 6af2a1c..893c280 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20241219 -%global gittartime 1522 +%global gittardate 20241225 +%global gittartime 1644 -%global gitbaredate 20241216 -%global git_rev fb651b87d2be140f0096458d51581faa1ebf86f4 +%global gitbaredate 20241221 +%global git_rev 37456d7d7839c55d2cf9d1c38d92c7571aeb463a %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -77,6 +77,9 @@ Source10: create-libfm-git-bare-tarball.sh Patch1: libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.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 +# https://bugzilla.redhat.com/show_bug.cgi?id=2333955 +# https://github.com/lxde/libfm/issues/104 +Patch11: libfm-pr105-Restore-ABI-for-libfm.so.patch Patch1000: libfm-1.3.0.2-moduledir-gtkspecific-v03.patch BuildRequires: pkgconfig(gio-unix-2.0) >= 2.26.0 @@ -256,7 +259,8 @@ do done %endif -cat %PATCH1 | git am +cat %PATCH1 | git am +cat %PATCH11 | git am %patch -P1000 -p1 -Z git commit -m "Use gtk version specific module directory" -a @@ -491,6 +495,10 @@ fi %endif %changelog +* Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241221git37456d7d-1 +- Update to the latest git +- Restore libfm.so ABI (bug 2333955) + * Thu Dec 19 2024 Mamoru TASAKA - 1.3.2^20241216gitfb651b87-1 - Update to the latest git diff --git a/sources b/sources index 803b03e..6afa68e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20241219T1522.tar.gz) = 18d8712cabf6d58cb244df00f77410dea5da71f24c5329c6ba784f480003af4ecaf08b5d687a8873eeb9e17dd311c04f2e3f4092f7be057a7d26cf14a62af2be +SHA512 (libfm-20241225T1644.tar.gz) = d29c81542bcb04291ae030d2fb5a9a49c103ab11b59f7f9e2957f85a6edcff999a495085bd08085a5a54a1a32d43d13f48831125bb3dfc98179ddeb019ff6cfb From 2da561432a83b974357c1442815b23249e7f939a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Jan 2025 15:16:34 +0900 Subject: [PATCH 41/51] update to the latest git --- libfm-pr105-Restore-ABI-for-libfm.so.patch | 78 ---------------------- libfm.spec | 15 ++--- sources | 2 +- 3 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 libfm-pr105-Restore-ABI-for-libfm.so.patch diff --git a/libfm-pr105-Restore-ABI-for-libfm.so.patch b/libfm-pr105-Restore-ABI-for-libfm.so.patch deleted file mode 100644 index 52e762d..0000000 --- a/libfm-pr105-Restore-ABI-for-libfm.so.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e91fe2ee51832f82843768757cc02125ad17735d Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Wed, 25 Dec 2024 17:33:19 +0900 -Subject: [PATCH] Restore ABI for libfm.so - -The following 2 commit: -https://github.com/lxde/libfm/commit/b0545e0e7bd347dbb8001c153f8bd46718d0c852 -https://github.com/lxde/libfm/commit/2854a4ce01f1e2868f2fa2f453eca5fe3fd8339c -broke libfm.so ABI because this changed the size of `struct _FmConfig` . - -Restore libfm.so ABI compared to before. -Fixes #104 . ---- - src/base/fm-config.c | 7 +++++-- - src/base/fm-config.h | 8 +++----- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/base/fm-config.c b/src/base/fm-config.c -index c4a99019..ecb2db32 100644 ---- a/src/base/fm-config.c -+++ b/src/base/fm-config.c -@@ -260,10 +260,12 @@ static void _parse_drop_default_action(GKeyFile *kf, gint *action) - void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) - { - char **strv; -+ gboolean bool_val; - - fm_key_file_get_bool(kf, "config", "use_trash", &cfg->use_trash); - fm_key_file_get_bool(kf, "config", "single_click", &cfg->single_click); -- fm_key_file_get_bool(kf, "config", "middle_click", &cfg->middle_click); -+ fm_key_file_get_bool(kf, "config", "middle_click", &bool_val); -+ cfg->middle_click = bool_val; - if(cfg->single_click && cfg->middle_click) - cfg->middle_click = FALSE; - fm_key_file_get_int(kf, "config", "auto_selection_delay", &cfg->auto_selection_delay); -@@ -280,7 +282,8 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf) - fm_key_file_get_bool(kf, "config", "advanced_mode", &cfg->advanced_mode); - fm_key_file_get_bool(kf, "config", "si_unit", &cfg->si_unit); - fm_key_file_get_bool(kf, "config", "force_startup_notify", &cfg->force_startup_notify); -- fm_key_file_get_bool(kf, "config", "date_iso_8601", &cfg->date_iso_8601); -+ fm_key_file_get_bool(kf, "config", "date_iso_8601", &bool_val); -+ cfg->date_iso_8601 = bool_val; - fm_key_file_get_bool(kf, "config", "backup_as_hidden", &cfg->backup_as_hidden); - fm_key_file_get_bool(kf, "config", "no_usb_trash", &cfg->no_usb_trash); - fm_key_file_get_bool(kf, "config", "no_child_non_expandable", &cfg->no_child_non_expandable); -diff --git a/src/base/fm-config.h b/src/base/fm-config.h -index 8e0b3eb8..48f397f2 100644 ---- a/src/base/fm-config.h -+++ b/src/base/fm-config.h -@@ -171,7 +171,6 @@ struct _FmConfig - gint drop_default_action; - - gboolean single_click; -- gboolean middle_click; - gboolean use_trash; - gboolean confirm_del; - gboolean confirm_trash; -@@ -181,7 +180,6 @@ struct _FmConfig - gboolean si_unit; - gboolean advanced_mode; - gboolean force_startup_notify; -- gboolean date_iso_8601; - gboolean backup_as_hidden; - gboolean no_usb_trash; - gboolean no_child_non_expandable; -@@ -215,9 +213,9 @@ struct _FmConfig - gboolean smart_desktop_autodrop; - gchar *saved_search; - /*< private >*/ -- gpointer _reserved1; /* reserved space for updates until next ABI */ -- gpointer _reserved2; -- gpointer _reserved3; -+ gintptr middle_click; -+ gintptr date_iso_8601; -+ gpointer _reserved3; /* reserved space for updates until next ABI */ - gpointer _reserved4; - gpointer _reserved5; - gpointer _reserved6; diff --git a/libfm.spec b/libfm.spec index 893c280..66c40c5 100644 --- a/libfm.spec +++ b/libfm.spec @@ -18,11 +18,11 @@ %global main_version 1.3.2 %if 0%{?use_gitbare} -%global gittardate 20241225 -%global gittartime 1644 +%global gittardate 20250114 +%global gittartime 1503 -%global gitbaredate 20241221 -%global git_rev 37456d7d7839c55d2cf9d1c38d92c7571aeb463a +%global gitbaredate 20250109 +%global git_rev 2d94c3c8c4a2c4e252a79da3ef2b6a70e9ec37e1 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -77,9 +77,6 @@ Source10: create-libfm-git-bare-tarball.sh Patch1: libfm-1.3.2-0001-fm_config_load_from_key_file-don-t-replace-string-va.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 -# https://bugzilla.redhat.com/show_bug.cgi?id=2333955 -# https://github.com/lxde/libfm/issues/104 -Patch11: libfm-pr105-Restore-ABI-for-libfm.so.patch Patch1000: libfm-1.3.0.2-moduledir-gtkspecific-v03.patch BuildRequires: pkgconfig(gio-unix-2.0) >= 2.26.0 @@ -260,7 +257,6 @@ done %endif cat %PATCH1 | git am -cat %PATCH11 | git am %patch -P1000 -p1 -Z git commit -m "Use gtk version specific module directory" -a @@ -495,6 +491,9 @@ fi %endif %changelog +* Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-1 +- Update to the latest git + * Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241221git37456d7d-1 - Update to the latest git - Restore libfm.so ABI (bug 2333955) diff --git a/sources b/sources index 6afa68e..72d34c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20241225T1644.tar.gz) = d29c81542bcb04291ae030d2fb5a9a49c103ab11b59f7f9e2957f85a6edcff999a495085bd08085a5a54a1a32d43d13f48831125bb3dfc98179ddeb019ff6cfb +SHA512 (libfm-20250114T1503.tar.gz) = 2665058991e9a22d36392ecaa7b0a4587e2b470f49e616f98abe579bebe29bc11e7d354120f7bea1f77786122720f6048fc7bfd76b1d94e500c8a602d1620877 From ed83457c20631ac9049fc238c94f5e23d825f584 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Jan 2025 22:17:22 +0900 Subject: [PATCH 42/51] 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 43/51] 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 44/51] 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 45/51] 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 46/51] 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 47/51] 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 48/51] 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 49/51] 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 50/51] 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 51/51] 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