Compare commits

..

No commits in common. "rawhide" and "f28" have entirely different histories.

5 changed files with 73 additions and 228 deletions

10
.gitignore vendored
View file

@ -1 +1,9 @@
/xfe-*.xz
/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

View file

@ -1 +1 @@
SHA512 (xfe-2.1.11.tar.xz) = 73c7cd4d7c809877cbecfc6703fe740d612ff3b034aa519a86a2fdc4db20529ace72f2a1c4ada3d9e3506ee827e74e28246342f87294ac7b096ad50ed0450207
SHA512 (xfe-1.43.1.tar.gz) = 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e

View file

@ -0,0 +1,12 @@
--- 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=''

View file

@ -1,6 +1,6 @@
--- 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
--- 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
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-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 \
--- 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 \
XFileExplorer.cpp \
main.cpp
@ -38,49 +38,9 @@
+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 \
@@ -158,18 +125,7 @@ xfp_SOURCES = ../st/x.c \
TextLabel.cpp \
xfp_SOURCES = ../st/st.c \
@@ -74,18 +63,7 @@ xfp_SOURCES = ../st/st.c \
DirHistBox.cpp \
XFilePackage.cpp
-if STARTUPNOTIFY
@ -98,9 +58,9 @@
+xfp_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@
xfw_SOURCES = ../st/x.c \
@@ -199,25 +155,14 @@ xfw_SOURCES = ../st/x.c \
WriteWindow.cpp \
xfw_SOURCES = ../st/st.c \
@@ -111,18 +89,7 @@ xfw_SOURCES = ../st/st.c \
FontDialog.cpp \
XFileWrite.cpp
-if STARTUPNOTIFY
@ -118,6 +78,24 @@
+xfw_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@
xfi_SOURCES = ../st/st.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

197
xfe.spec
View file

@ -1,30 +1,22 @@
%global hash_thread1 2501673c
%global hash_thread2 5d70
%global main_version 2.1.11
%global use_gcc_strict_sanitize 0
Name: xfe
Version: %{main_version}
Version: 1.43.1
Release: 1%{?dist}
Summary: X File Explorer File Manager
# 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
License: GPLv2+
URL: http://roland65.free.fr/xfe/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{main_version}.tar.xz
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Temporarily
# Use system-wide startup-notification: need discuss with upstream
Patch0: xfe-2.0-use-system-libsn.patch
Patch0: xfe-1.43-use-system-libsn.patch
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fox-devel
BuildRequires: freetype-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: libpng-devel
@ -32,11 +24,6 @@ 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)
@ -45,11 +32,6 @@ 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.
@ -63,8 +45,8 @@ BuildArch: noarch
This package contains extra theme files for %{name}.
%prep
%setup -q -n %{name}-%{main_version}
%patch -P0 -p1 -b .syssn
%setup -q
%patch0 -p1 -b .syssn
for f in \
ChangeLog
@ -75,29 +57,11 @@ do
rm -f $f.iso
done
# Fix libreoffice related command name (bug 1788292)
sed -i.oo xferc.in \
-e 's|lobase|oobase|g' \
-e 's|localc|oocalc|g' \
-e 's|lodraw|oodraw|g' \
-e 's|loimpress|ooimpress|g' \
-e 's|lomath|oomath|g' \
-e 's|lowriter|oowriter|g' \
%{nil}
# Patch0
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}
@ -112,7 +76,7 @@ make %{?_smp_mflags}
mkdir -p %{buildroot}%{_datadir}/%{name}/pixmaps
mkdir -p %{buildroot}%{_bindir}
for suffix in \
a i e p w
i e p w
do
cat > %{buildroot}%{_bindir}/xfe-xf${suffix} <<EOF
#!/bin/sh
@ -121,21 +85,31 @@ exec xf${suffix} \$@
EOF
chmod 0755 %{buildroot}%{_bindir}/xfe-xf${suffix}
mv %{buildroot}%{_datadir}/pixmaps/xf${suffix}.{png,xpm} \
%{buildroot}%{_datadir}/%{name}/pixmaps/
mv %{buildroot}%{_datadir}/applications/{,xfe-}xf${suffix}.desktop
# Modify desktop file
sed -i \
-e "\@^Exec=@s|xf${suffix}|xfe-xf${suffix}|" \
-e "s|Icon=xf${suffix}|Icon=%{_datadir}/%{name}/pixmaps/xf${suffix}.png|" \
%{buildroot}%{_datadir}/applications/xfe-xf${suffix}.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/xfe-xf${suffix}.desktop
mv %{buildroot}%{_mandir}/man1/{,xfe-}xf${suffix}.1
done
rmdir %{buildroot}%{_datadir}/pixmaps/
# Move configuration files
mkdir %{buildroot}%{_sysconfdir}
mv %{buildroot}%{_datadir}/%{name}/xferc \
%{buildroot}%{_sysconfdir}
ln -sf ../../../%{_sysconfdir}/xferc %{buildroot}%{_datadir}/%{name}/xferc
ln -sf %{_sysconfdir}/xferc %{buildroot}%{_datadir}/%{name}/xferc
%post
update-desktop-database &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
%files -f %{name}.lang
%doc AUTHORS
@ -146,153 +120,26 @@ ln -sf ../../../%{_sysconfdir}/xferc %{buildroot}%{_datadir}/%{name}/xferc
%doc TODO
%config(noreplace) %{_sysconfdir}/xferc
%{_datadir}/applications/xfe-xf*.desktop
%{_bindir}/xfe-xf*
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/xf*
%{_datadir}/applications/xfe-xf*.desktop
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/xferc
%dir %{_datadir}/%{name}/icons/
%{_datadir}/%{name}/icons/default-theme/
# xferc defaults to gnomeblue-theme, so let's use this
%{_datadir}/%{name}/icons/gnome*-theme/
%{_datadir}/%{name}/pixmaps/
%{_datadir}/icons/hicolor/*/apps/xf*.*
%{_datadir}/polkit-1/actions/org.xfe.root.policy
%{_mandir}/man1/xfe-xf*.1*
%files theme
%{_datadir}/%{name}/icons/*-theme/
%exclude %{_datadir}/%{name}/icons/default-theme/
%exclude %{_datadir}/%{name}/icons/gnome*-theme/
%changelog
* Mon Aug 03 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.11-1
- 2.1.11
* Sat Aug 01 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.10-1
- 2.1.10
* Sun Jul 26 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.9-1
- 2.1.9
* Sun Jul 19 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.8-1
- 2.1.8
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Tue May 26 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.7-1
- 2.1.7
* Sun Mar 29 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.6-1
- 2.1.6
* Sun Mar 01 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.5-1
- 2.1.5
* Tue Feb 10 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.4-1
- 2.1.4
* Mon Jan 19 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.3-1
- 2.1.3
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Jan 05 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <mtasaka@fedoraproject.org> - 2.1.2-1
- 2.1.2
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.1-1
- 2.1.1
* Thu May 22 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1-1
- 2.1
* Tue Mar 18 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.1.respin1-1
- 2.0.1 respin
* Sun Jan 19 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.1-1
- 2.0.1
* Sun Jan 12 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0-1
- 2.0
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.46.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Mar 04 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.46.1-1
- 1.46.1
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.46-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 4 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.46-1
- 1.46
* Tue Nov 14 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.45-6
- Fix abort when opening font selection (bug 2249586) (upstream bug 278)
* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.45-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat May 6 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.45-4
- Fix window disappearance after opening recent file (upstream bug 275)
(bug 2190356)
* Wed Apr 26 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.45-3
- SPDX migration
- Fix crash with Ctrl-L (upstream bug 274)
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.45-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Dec 31 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.45-1
- 1.45
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 30 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.44-1
- 1.44
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.43.2-3
- Fix libreoffice binding (bug 1788292)
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jun 19 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.43.2-1
- 1.43.2
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Sep 25 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.43.1-1
* Mon Sep 25 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.43.1-1
- 1.43.1
* Fri Jul 20 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.43-1