diff --git a/sources b/sources index 53ddda0..e43ebb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfe-1.45.tar.xz) = 3d511fec3070b39c08b83c19178890dea6f7a306dee0c51a98b6ed8eafc5148973da6d803beb2053be131d389dd74eef829459fe39e212f53b983b19d5d1cb4f +SHA512 (xfe-2.1.11.tar.xz) = 73c7cd4d7c809877cbecfc6703fe740d612ff3b034aa519a86a2fdc4db20529ace72f2a1c4ada3d9e3506ee827e74e28246342f87294ac7b096ad50ed0450207 diff --git a/xfe-1.45-ctrl-l-bug274.patch b/xfe-1.45-ctrl-l-bug274.patch deleted file mode 100644 index 3915be2..0000000 --- a/xfe-1.45-ctrl-l-bug274.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xfe-1.45/src/XFileExplorer.cpp.orig 2023-04-25 18:22:21.416081549 +0900 -+++ xfe-1.45/src/XFileExplorer.cpp 2023-04-25 18:22:46.788084146 +0900 -@@ -1259,8 +1259,6 @@ XFileExplorer::XFileExplorer(FXApp* app, - - prevdir = FXString::null; - prev_width = getWidth(); -- -- delete btn; - } - - diff --git a/xfe-1.45-font-selection-buffer-size-bug278.patch b/xfe-1.45-font-selection-buffer-size-bug278.patch deleted file mode 100644 index 41709c9..0000000 --- a/xfe-1.45-font-selection-buffer-size-bug278.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xfe-1.45/src/FontDialog.cpp.debug 2022-12-23 20:05:51.000000000 +0900 -+++ xfe-1.45/src/FontDialog.cpp 2023-11-14 22:47:01.250243819 +0900 -@@ -152,7 +152,7 @@ - preview->setBackColor(getApp()->getBackColor()); - - FXString fontname = FXString(DEFAULT_NORMAL_FONT); -- strlcpy(selected.face, fontname.before(',').text(), sizeof(selected.face) + 1); -+ strlcpy(selected.face, fontname.before(',').text(), sizeof(selected.face)); - selected.size = 90; - selected.weight = FXFont::Bold; - selected.slant = 0; -@@ -203,7 +203,7 @@ - familylist->setCurrentItem(selindex); - familylist->makeItemVisible(selindex); - family->setText(familylist->getItemText(selindex)); -- strlcpy(selected.face, familylist->getItemText(selindex).text(), sizeof(selected.face) + 1); -+ strlcpy(selected.face, familylist->getItemText(selindex).text(), sizeof(selected.face)); - } - FXFREE(&fonts); - } -@@ -464,7 +464,7 @@ - // Selected font family - long FontSelector::onCmdFamily(FXObject*, FXSelector, void* ptr) - { -- strlcpy(selected.face, familylist->getItemText((int)(FXival)ptr).text(), sizeof(selected.face) + 1); -+ strlcpy(selected.face, familylist->getItemText((int)(FXival)ptr).text(), sizeof(selected.face)); - family->setText(selected.face); - listWeights(); - listSlants(); diff --git a/xfe-1.45-xfw-recent-files-bug275.patch b/xfe-1.45-xfw-recent-files-bug275.patch deleted file mode 100644 index 3768676..0000000 --- a/xfe-1.45-xfw-recent-files-bug275.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xfe-1.45/src/WriteWindow.cpp.window_delete 2022-12-23 20:05:50.000000000 +0900 -+++ xfe-1.45/src/WriteWindow.cpp 2023-05-06 16:30:24.903053616 +0900 -@@ -1532,8 +1532,6 @@ long WriteWindow::onCmdNew(FXObject*, FX - window->create(); - window->raise(); - window->setFocus(); -- -- delete window; - return(1); - } - -@@ -1623,8 +1621,6 @@ long WriteWindow::onCmdOpenRecent(FXObje - } - window->raise(); - window->setFocus(); -- -- delete window; - return(1); - } - 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 581d724..3fd6cb3 100644 --- a/xfe.spec +++ b/xfe.spec @@ -1,11 +1,13 @@ %global hash_thread1 2501673c %global hash_thread2 5d70 +%global main_version 2.1.11 + %global use_gcc_strict_sanitize 0 Name: xfe -Version: 1.45 -Release: 6%{?dist} +Version: %{main_version} +Release: 1%{?dist} Summary: X File Explorer File Manager # GPL-2.0-or-later: README @@ -14,21 +16,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}-%{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 -# https://sourceforge.net/p/xfe/bugs/274/ -# xfe 1.45 segfaults with Ctrl-L -Patch1: xfe-1.45-ctrl-l-bug274.patch -# https://sourceforge.net/p/xfe/bugs/275/ -# https://bugzilla.redhat.com/show_bug.cgi?id=2190356 -# xfw 1.45 window disappears after opening from recent files -Patch2: xfe-1.45-xfw-recent-files-bug275.patch -# https://sourceforge.net/p/xfe/bugs/278/ -# https://bugzilla.redhat.com/show_bug.cgi?id=2249586 -# xfe / xfw aborts with opening font selection -Patch3: xfe-1.45-font-selection-buffer-size-bug278.patch +Patch0: xfe-2.0-use-system-libsn.patch BuildRequires: make BuildRequires: gcc-c++ @@ -43,6 +34,9 @@ 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) @@ -69,11 +63,8 @@ BuildArch: noarch This package contains extra theme files for %{name}. %prep -%setup -q +%setup -q -n %{name}-%{main_version} %patch -P0 -p1 -b .syssn -%patch -P1 -p1 -b .ctrl-l -%patch -P2 -p1 -b .window_delete -%patch -P3 -p1 -b .fontsel for f in \ ChangeLog @@ -105,12 +96,6 @@ 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 \ @@ -127,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)