diff --git a/.gitignore b/.gitignore index 930fdfd..16d5721 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -/xfe-1.34.tar.gz -/xfe-1.35.tar.gz -/xfe-1.37.tar.gz -/xfe-1.40.tar.gz -/xfe-1.40.1.tar.gz -/xfe-1.41.tar.gz -/xfe-1.42.tar.gz -/xfe-1.43.tar.gz -/xfe-1.43.1.tar.gz -/xfe-1.43.2.tar.gz -/xfe-1.44.tar.xz +/xfe-*.xz diff --git a/sources b/sources index 3c1bddb..e43ebb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfe-1.44.tar.xz) = d02f0db46c5ca6e26cff447d7f11bbc5f03a9d28b8d492a783bb47f67431a022785d6f3b25013f82a6121a8675f86caf1a9154a7faa8186e05cf4de0bd2f1749 +SHA512 (xfe-2.1.11.tar.xz) = 73c7cd4d7c809877cbecfc6703fe740d612ff3b034aa519a86a2fdc4db20529ace72f2a1c4ada3d9e3506ee827e74e28246342f87294ac7b096ad50ed0450207 diff --git a/xfe-1.37-freetype-253.patch b/xfe-1.37-freetype-253.patch deleted file mode 100644 index 209b11a..0000000 --- a/xfe-1.37-freetype-253.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xfe-1.37/configure.ac.freetype253 2014-06-09 11:29:27.072028047 +0900 -+++ xfe-1.37/configure.ac 2014-06-09 12:52:37.864917035 +0900 -@@ -120,7 +120,8 @@ - LIBS="$LIBS $freetype_libs" - CPPFLAGS="$freetype_cflags $CPPFLAGS" - fi -- AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found")) -+ AC_CHECK_HEADER(freetype/config/ftheader.h,, -+ [AC_CHECK_HEADER(freetype2/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))]) - - # Check for Xft headers - xft_config='' diff --git a/xfe-1.44-use-system-libsn.patch b/xfe-2.0-use-system-libsn.patch similarity index 70% rename from xfe-1.44-use-system-libsn.patch rename to xfe-2.0-use-system-libsn.patch index db89e71..250ce4b 100644 --- a/xfe-1.44-use-system-libsn.patch +++ b/xfe-2.0-use-system-libsn.patch @@ -1,6 +1,6 @@ ---- xfe-1.43/configure.ac.syssn 2018-07-20 15:30:14.394878201 +0900 -+++ xfe-1.43/configure.ac 2018-07-20 15:40:55.015553061 +0900 -@@ -180,9 +180,13 @@ AC_ARG_ENABLE(sn,[ --disable-sn +--- xfe-2.0/configure.ac.syssn 2024-12-13 01:25:08.000000000 +0900 ++++ xfe-2.0/configure.ac 2025-01-12 16:00:33.560454862 +0900 +@@ -178,9 +178,13 @@ AC_ARG_ENABLE(sn,[ --disable-sn AC_MSG_RESULT([$enable_sn]) AC_SUBST(STARTUPNOTIFY,false) if test "x$enable_sn" != "xno"; then @@ -17,9 +17,9 @@ # Check for xcb libs PKG_CHECK_MODULES([xcb], [xcb >= 1.6],, ---- xfe-1.43/src/Makefile.am.syssn 2018-05-15 21:37:00.000000000 +0900 -+++ xfe-1.43/src/Makefile.am 2018-07-20 15:30:14.395878213 +0900 -@@ -39,18 +39,7 @@ xfe_SOURCES = ../st/st.c \ +--- xfe-2.0/src/Makefile.am.syssn 2025-01-12 16:00:33.560454862 +0900 ++++ xfe-2.0/src/Makefile.am 2025-01-12 16:03:12.205154877 +0900 +@@ -44,18 +44,7 @@ xfe_SOURCES = ../st/x.c \ XFileExplorer.cpp \ main.cpp @@ -38,9 +38,49 @@ +xfe_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@ + xfa_SOURCES = ../st/x.c \ +@@ -82,18 +71,7 @@ xfa_SOURCES = ../st/x.c \ + TextLabel.cpp \ + XFileArchive.cpp + +-if STARTUPNOTIFY +-xfa_SOURCES += ../libsn/sn-common.c \ +- ../libsn/sn-launchee.c \ +- ../libsn/sn-launcher.c \ +- ../libsn/sn-list.c \ +- ../libsn/sn-monitor.c \ +- ../libsn/sn-util.c \ +- ../libsn/sn-xmessages.c \ +- ../libsn/sn-xutils.c +-endif +- +-xfa_LDADD = @LIBINTL@ -lutil ++xfa_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@ + + + xfi_SOURCES = ../st/x.c \ +@@ -120,18 +98,7 @@ xfi_SOURCES = ../st/x.c \ + TextLabel.cpp \ + XFileImage.cpp + +-if STARTUPNOTIFY +-xfi_SOURCES += ../libsn/sn-common.c \ +- ../libsn/sn-launchee.c \ +- ../libsn/sn-launcher.c \ +- ../libsn/sn-list.c \ +- ../libsn/sn-monitor.c \ +- ../libsn/sn-util.c \ +- ../libsn/sn-xmessages.c \ +- ../libsn/sn-xutils.c +-endif +- +-xfi_LDADD = @LIBINTL@ -lutil ++xfi_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@ + + xfp_SOURCES = ../st/x.c \ -@@ -74,18 +63,7 @@ xfp_SOURCES = ../st/st.c \ - DirHistBox.cpp \ +@@ -158,18 +125,7 @@ xfp_SOURCES = ../st/x.c \ + TextLabel.cpp \ XFilePackage.cpp -if STARTUPNOTIFY @@ -59,8 +99,8 @@ xfw_SOURCES = ../st/x.c \ -@@ -111,18 +89,7 @@ xfw_SOURCES = ../st/st.c \ - FontDialog.cpp \ +@@ -199,25 +155,14 @@ xfw_SOURCES = ../st/x.c \ + WriteWindow.cpp \ XFileWrite.cpp -if STARTUPNOTIFY @@ -78,24 +118,6 @@ +xfw_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@ - xfi_SOURCES = ../st/x.c \ -@@ -146,23 +113,12 @@ xfi_SOURCES = ../st/st.c \ - PathLinker.cpp \ - XFileImage.cpp - --if STARTUPNOTIFY --xfi_SOURCES += ../libsn/sn-common.c \ -- ../libsn/sn-launchee.c \ -- ../libsn/sn-launcher.c \ -- ../libsn/sn-list.c \ -- ../libsn/sn-monitor.c \ -- ../libsn/sn-util.c \ -- ../libsn/sn-xmessages.c \ -- ../libsn/sn-xutils.c --endif -- --xfi_LDADD = @LIBINTL@ -lutil -+xfi_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@ localedir = $(datadir)/locale diff --git a/xfe.spec b/xfe.spec index dc468ce..3fd6cb3 100644 --- a/xfe.spec +++ b/xfe.spec @@ -1,17 +1,25 @@ %global hash_thread1 2501673c %global hash_thread2 5d70 +%global main_version 2.1.11 + +%global use_gcc_strict_sanitize 0 + Name: xfe -Version: 1.44 -Release: 2%{?dist} +Version: %{main_version} +Release: 1%{?dist} Summary: X File Explorer File Manager -License: GPLv2+ +# GPL-2.0-or-later: README +# Zlib: src/xfeutils.h +# MIT: st/x.c +# SPDX confirmed +License: GPL-2.0-or-later AND Zlib AND MIT URL: http://roland65.free.fr/xfe/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{main_version}.tar.xz # Temporarily # Use system-wide startup-notification: need discuss with upstream -Patch0: xfe-1.44-use-system-libsn.patch +Patch0: xfe-2.0-use-system-libsn.patch BuildRequires: make BuildRequires: gcc-c++ @@ -24,7 +32,11 @@ BuildRequires: libX11-devel BuildRequires: libXft-devel BuildRequires: libXrandr-devel BuildRequires: startup-notification-devel +BuildRequires: /usr/bin/pkexec BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(udisks2) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-aux) BuildRequires: pkgconfig(xcb-event) @@ -33,6 +45,11 @@ BuildRequires: pkgconfig(x11-xcb) BuildRequires: autoconf BuildRequires: automake +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif + %description X File Explorer (xfe) is a lightweight file manager for X11, written using the FOX toolkit. @@ -46,8 +63,8 @@ BuildArch: noarch This package contains extra theme files for %{name}. %prep -%setup -q -%patch0 -p1 -b .syssn +%setup -q -n %{name}-%{main_version} +%patch -P0 -p1 -b .syssn for f in \ ChangeLog @@ -73,6 +90,14 @@ autoreconf -fi rm -rf libsn %build +%set_build_flags + +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr" +export LDFLAGS="${LDFLAGS} -pthread" +%endif + %configure \ --bindir=%{_libexecdir}/%{name} make %{?_smp_mflags} @@ -87,7 +112,7 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_datadir}/%{name}/pixmaps mkdir -p %{buildroot}%{_bindir} for suffix in \ - i e p w + a i e p w do cat > %{buildroot}%{_bindir}/xfe-xf${suffix} < - 2.1.11-1 +- 2.1.11 + +* Sat Aug 01 2026 Mamoru TASAKA - 2.1.10-1 +- 2.1.10 + +* Sun Jul 26 2026 Mamoru TASAKA - 2.1.9-1 +- 2.1.9 + +* Sun Jul 19 2026 Mamoru TASAKA - 2.1.8-1 +- 2.1.8 + +* Fri Jul 17 2026 Fedora Release Engineering - 2.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Tue May 26 2026 Mamoru TASAKA - 2.1.7-1 +- 2.1.7 + +* Sun Mar 29 2026 Mamoru TASAKA - 2.1.6-1 +- 2.1.6 + +* Sun Mar 01 2026 Mamoru TASAKA - 2.1.5-1 +- 2.1.5 + +* Tue Feb 10 2026 Mamoru TASAKA - 2.1.4-1 +- 2.1.4 + +* Mon Jan 19 2026 Mamoru TASAKA - 2.1.3-1 +- 2.1.3 + +* Sat Jan 17 2026 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Jan 05 2026 Mamoru TASAKA - 2.1.2-2 +- Workaround for use-after-free when trying to repaint window after opening + supprted file (bug 2425678) + +* Thu Jan 01 2026 Mamoru TASAKA - 2.1.2-1 +- 2.1.2 + +* Fri Jul 25 2025 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Mamoru TASAKA - 2.1.1-1 +- 2.1.1 + +* Thu May 22 2025 Mamoru TASAKA - 2.1-1 +- 2.1 + +* Tue Mar 18 2025 Mamoru TASAKA - 2.0.1.respin1-1 +- 2.0.1 respin + +* Sun Jan 19 2025 Mamoru TASAKA - 2.0.1-1 +- 2.0.1 + +* Sun Jan 12 2025 Mamoru TASAKA - 2.0-1 +- 2.0 + +* Sat Jul 20 2024 Fedora Release Engineering - 1.46.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Mar 04 2024 Mamoru TASAKA - 1.46.1-1 +- 1.46.1 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.46-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 4 2024 Mamoru TASAKA - 1.46-1 +- 1.46 + +* Tue Nov 14 2023 Mamoru TASAKA - 1.45-6 +- Fix abort when opening font selection (bug 2249586) (upstream bug 278) + +* Sat Jul 22 2023 Mamoru TASAKA - 1.45-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat May 6 2023 Mamoru TASAKA - 1.45-4 +- Fix window disappearance after opening recent file (upstream bug 275) + (bug 2190356) + +* Wed Apr 26 2023 Mamoru TASAKA - 1.45-3 +- SPDX migration +- Fix crash with Ctrl-L (upstream bug 274) + +* Sat Jan 21 2023 Fedora Release Engineering - 1.45-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Dec 31 2022 Mamoru TASAKA - 1.45-1 +- 1.45 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.44-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.44-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.44-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild