Update to xfe-1.44

Some bug fixes and icon refreshes.
This commit is contained in:
bcallah 2021-10-03 21:19:57 +00:00
parent dc935eba2d
commit fc7e2c271a
7 changed files with 679 additions and 1323 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.52 2019/06/13 21:50:36 bcallah Exp $ # $OpenBSD: Makefile,v 1.53 2021/10/03 21:19:57 bcallah Exp $
COMMENT= MS-Explorer like file manager for X COMMENT= MS-Explorer like file manager for X
DISTNAME= xfe-1.43.2 DISTNAME= xfe-1.44
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11 CATEGORIES= x11
HOMEPAGE= http://roland65.free.fr/xfe/ HOMEPAGE= http://roland65.free.fr/xfe/
@ -12,7 +13,7 @@ MAINTAINER= Brian Callahan <bcallah@openbsd.org>
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} FOX-1.6 X11 X11-xcb Xft Xrandr c WANTLIB += ${COMPILER_LIBCXX} FOX-1.6 X11 X11-xcb Xft Xrandr c
WANTLIB += fontconfig freetype intl m png util xcb xcb-util z WANTLIB += fontconfig freetype m png util xcb xcb-util z
COMPILER = base-clang ports-gcc base-gcc COMPILER = base-clang ports-gcc base-gcc

View File

@ -1,2 +1,2 @@
SHA256 (xfe-1.43.2.tar.gz) = +l84/KxkuR611hViCpYHt+b4Z1xPGfMEc3mLKssMhbo= SHA256 (xfe-1.44.tar.xz) = WUwU0YW9/H4xMq79p89OIzYlJYypoZOTWZRKLAfAMLY=
SIZE (xfe-1.43.2.tar.gz) = 2834576 SIZE (xfe-1.44.tar.xz) = 1444296

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.17 2019/06/13 21:50:36 bcallah Exp $ $OpenBSD: patch-Makefile_in,v 1.18 2021/10/03 21:19:58 bcallah Exp $
Index: Makefile.in Index: Makefile.in
--- Makefile.in.orig --- Makefile.in.orig
+++ Makefile.in +++ Makefile.in
@@ -594,17 +594,13 @@ uninstall-iconDATA: @@ -600,17 +600,13 @@ uninstall-iconDATA:
install-rcDATA: $(rc_DATA) install-rcDATA: $(rc_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(rc_DATA)'; test -n "$(rcdir)" || list=; \ @list='$(rc_DATA)'; test -n "$(rcdir)" || list=; \

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_FilePanel_cpp,v 1.3 2016/07/01 08:46:52 landry Exp $ $OpenBSD: patch-src_FilePanel_cpp,v 1.4 2021/10/03 21:19:58 bcallah Exp $
onCmdDirUsage is linux-only for now onCmdDirUsage is linux-only for now
--- src/FilePanel.cpp.orig Fri Jul 1 10:17:59 2016 Index: src/FilePanel.cpp
+++ src/FilePanel.cpp Fri Jul 1 10:18:06 2016 --- src/FilePanel.cpp.orig
@@ -124,7 +124,6 @@ FXDEFMAP(FilePanel) FilePanelMap[] = +++ src/FilePanel.cpp
@@ -127,7 +127,6 @@ FXDEFMAP(FilePanel) FilePanelMap[] =
FXMAPFUNC(SEL_COMMAND, FilePanel::ID_RUN_SCRIPT, FilePanel::onCmdRunScript), FXMAPFUNC(SEL_COMMAND, FilePanel::ID_RUN_SCRIPT, FilePanel::onCmdRunScript),
FXMAPFUNC(SEL_UPDATE, FilePanel::ID_RUN_SCRIPT, FilePanel::onUpdRunScript), FXMAPFUNC(SEL_UPDATE, FilePanel::ID_RUN_SCRIPT, FilePanel::onUpdRunScript),
FXMAPFUNC(SEL_COMMAND, FilePanel::ID_GO_SCRIPTDIR, FilePanel::onCmdGoScriptDir), FXMAPFUNC(SEL_COMMAND, FilePanel::ID_GO_SCRIPTDIR, FilePanel::onCmdGoScriptDir),
@ -12,7 +13,7 @@ onCmdDirUsage is linux-only for now
FXMAPFUNC(SEL_RIGHTBUTTONRELEASE, FilePanel::ID_FILELIST, FilePanel::onCmdPopupMenu), FXMAPFUNC(SEL_RIGHTBUTTONRELEASE, FilePanel::ID_FILELIST, FilePanel::onCmdPopupMenu),
FXMAPFUNC(SEL_COMMAND, FilePanel::ID_POPUP_MENU, FilePanel::onCmdPopupMenu), FXMAPFUNC(SEL_COMMAND, FilePanel::ID_POPUP_MENU, FilePanel::onCmdPopupMenu),
FXMAPFUNC(SEL_DOUBLECLICKED, FilePanel::ID_FILELIST, FilePanel::onCmdItemDoubleClicked), FXMAPFUNC(SEL_DOUBLECLICKED, FilePanel::ID_FILELIST, FilePanel::onCmdItemDoubleClicked),
@@ -155,6 +154,7 @@ FXDEFMAP(FilePanel) FilePanelMap[] = @@ -158,6 +157,7 @@ FXDEFMAP(FilePanel) FilePanelMap[] =
FXMAPFUNC(SEL_UPDATE, FilePanel::ID_TOGGLE_THUMBNAILS, FilePanel::onUpdToggleThumbnails), FXMAPFUNC(SEL_UPDATE, FilePanel::ID_TOGGLE_THUMBNAILS, FilePanel::onUpdToggleThumbnails),
FXMAPFUNC(SEL_UPDATE, FilePanel::ID_DIR_USAGE, FilePanel::onUpdDirUsage), FXMAPFUNC(SEL_UPDATE, FilePanel::ID_DIR_USAGE, FilePanel::onUpdDirUsage),
#if defined(linux) #if defined(linux)

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_SearchWindow_cpp,v 1.4 2016/10/20 21:12:38 giovanni Exp $ $OpenBSD: patch-src_SearchWindow_cpp,v 1.5 2021/10/03 21:19:58 bcallah Exp $
Remove gnuisms. The Find Hidden checkbox does nothing now. Remove gnuisms. The Find Hidden checkbox does nothing now.
--- src/SearchWindow.cpp.orig Tue Dec 15 14:54:20 2015 Index: src/SearchWindow.cpp
+++ src/SearchWindow.cpp Sun Oct 9 20:50:02 2016 --- src/SearchWindow.cpp.orig
@@ -639,7 +639,7 @@ long SearchWindow::onCmdStart(FXObject*, FXSelector, v +++ src/SearchWindow.cpp
@@ -644,7 +644,7 @@ long SearchWindow::onCmdStart(FXObject*, FXSelector, v
} }
else else
{ {
@ -13,7 +14,7 @@ Remove gnuisms. The Find Hidden checkbox does nothing now.
} }
// Ignore case // Ignore case
@@ -745,7 +745,7 @@ long SearchWindow::onCmdStart(FXObject*, FXSelector, v @@ -750,7 +750,7 @@ long SearchWindow::onCmdStart(FXObject*, FXSelector, v
// Hidden files // Hidden files
if (!findhidden->getCheck()) if (!findhidden->getCheck())
{ {

View File

@ -1,20 +1,21 @@
$OpenBSD: patch-src_xfedefs_h,v 1.5 2016/09/04 09:04:39 giovanni Exp $ $OpenBSD: patch-src_xfedefs_h,v 1.6 2021/10/03 21:19:58 bcallah Exp $
Unbreak launching Xfe as root with sudo or su (fix gnuisms) Unbreak launching Xfe as root with sudo or su (fix gnuisms)
--- src/xfedefs.h.orig Wed Jul 27 13:27:41 2016 Index: src/xfedefs.h
+++ src/xfedefs.h Sun Sep 4 10:20:49 2016 --- src/xfedefs.h.orig
+++ src/xfedefs.h
@@ -172,11 +172,11 @@ @@ -172,11 +172,11 @@
// Command to launch Xfe as root with sudo or su, using st as a terminal // Command to launch Xfe as root with sudo or su, using st as a terminal
#ifndef SUDOCMD #ifndef DEFAULT_SUDO_CMD
-#define SUDOCMD " -g 60x4 -e sudo su -c 'nohup xfe >& /dev/null & sleep 1'" -#define DEFAULT_SUDO_CMD "sudo -b xfe"
+#define SUDOCMD " -g 60x4 -e doas su root -c 'nohup xfe >/dev/null 2>&1 & sleep 1'" +#define DEFAULT_SUDO_CMD "doas su root -c 'nohup xfe >/dev/null 2>&1 & sleep 1'"
#endif #endif
#ifndef SUCMD #ifndef DEFAULT_SU_CMD
-#define SUCMD " -g 60x4 -e su -c 'nohup xfe >& /dev/null & sleep 1'" -#define DEFAULT_SU_CMD "su -c 'nohup xfe >& /dev/null &'"
+#define SUCMD " -g 60x4 -e su root -c 'nohup xfe >/dev/null 2>&1 & sleep 1'" +#define DEFAULT_SU_CMD "su root -c 'nohup xfe >/dev/null 2>&1 & sleep 1'"
#endif #endif
// Tooltips setup time and duration // Tooltips setup time and duration

File diff suppressed because it is too large Load Diff