Compare commits
No commits in common. "rawhide" and "f39" have entirely different histories.
3 changed files with 46 additions and 124 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (xfe-2.1.11.tar.xz) = 73c7cd4d7c809877cbecfc6703fe740d612ff3b034aa519a86a2fdc4db20529ace72f2a1c4ada3d9e3506ee827e74e28246342f87294ac7b096ad50ed0450207
|
||||
SHA512 (xfe-1.46.1.tar.xz) = bdd0eb017797e8e5d0ea61e86cbcff686eaee5dd5a14fbe770630ccd0c31f2ea6e544e66cc8bc178760670e821caae388d12ba285c8556f618a540cffeb61593
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
@@ -74,18 +63,7 @@ xfp_SOURCES = ../st/st.c \
|
||||
DirHistBox.cpp \
|
||||
XFilePackage.cpp
|
||||
|
||||
-if STARTUPNOTIFY
|
||||
|
|
@ -99,8 +59,8 @@
|
|||
|
||||
|
||||
xfw_SOURCES = ../st/x.c \
|
||||
@@ -199,25 +155,14 @@ xfw_SOURCES = ../st/x.c \
|
||||
WriteWindow.cpp \
|
||||
@@ -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/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
|
||||
90
xfe.spec
90
xfe.spec
|
|
@ -1,12 +1,10 @@
|
|||
%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.46.1
|
||||
Release: 1%{?dist}
|
||||
Summary: X File Explorer File Manager
|
||||
|
||||
|
|
@ -16,10 +14,10 @@ Summary: X File Explorer File Manager
|
|||
# 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}-%{main_version}.tar.xz
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
||||
# Temporarily
|
||||
# Use system-wide startup-notification: need discuss with upstream
|
||||
Patch0: xfe-2.0-use-system-libsn.patch
|
||||
Patch0: xfe-1.44-use-system-libsn.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -34,9 +32,6 @@ 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)
|
||||
|
|
@ -63,7 +58,7 @@ BuildArch: noarch
|
|||
This package contains extra theme files for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{main_version}
|
||||
%setup -q
|
||||
%patch -P0 -p1 -b .syssn
|
||||
|
||||
for f in \
|
||||
|
|
@ -96,6 +91,12 @@ rm -rf libsn
|
|||
export CC="${CC} -fsanitize=address -fsanitize=undefined"
|
||||
export CXX="${CXX} -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr"
|
||||
export LDFLAGS="${LDFLAGS} -pthread"
|
||||
|
||||
# Currently -fPIE binary cannot work with ASAN on kernel 4.12
|
||||
# https://github.com/google/sanitizers/issues/837
|
||||
export CFLAGS="$(echo $CFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
export CXXFLAGS="$(echo $CXXFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
|
|
@ -112,7 +113,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 +122,25 @@ 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
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc AUTHORS
|
||||
|
|
@ -160,7 +165,7 @@ ln -sf ../../../%{_sysconfdir}/xferc %{buildroot}%{_datadir}/%{name}/xferc
|
|||
%{_datadir}/%{name}/icons/gnome*-theme/
|
||||
%{_datadir}/%{name}/pixmaps/
|
||||
|
||||
%{_datadir}/icons/hicolor/*/apps/xf*.*
|
||||
%{_datadir}/icons/hicolor/scalable/apps/xf*.svg
|
||||
|
||||
%{_datadir}/polkit-1/actions/org.xfe.root.policy
|
||||
|
||||
|
|
@ -172,67 +177,6 @@ ln -sf ../../../%{_sysconfdir}/xferc %{buildroot}%{_datadir}/%{name}/xferc
|
|||
%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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue