diff --git a/distributions/ROCKNIX/options b/distributions/ROCKNIX/options index 0a00eb1ed..9ac8d368c 100644 --- a/distributions/ROCKNIX/options +++ b/distributions/ROCKNIX/options @@ -125,7 +125,7 @@ # Support for debug tools such as strace DEBUG_PACKAGES="${DEBUG_PACKAGES:-yes}" -# Windowmanager to use (fluxbox / none) +# Windowmanager to use (weston / swaywm-env / no) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) diff --git a/packages/x11/other/fluxbox/config/apps b/packages/x11/other/fluxbox/config/apps deleted file mode 100644 index fac0e6d4b..000000000 --- a/packages/x11/other/fluxbox/config/apps +++ /dev/null @@ -1,3 +0,0 @@ -[app] (name=.*) - [maximized] {yes} -[end] diff --git a/packages/x11/other/fluxbox/config/init b/packages/x11/other/fluxbox/config/init deleted file mode 100644 index 0cb0ef025..000000000 --- a/packages/x11/other/fluxbox/config/init +++ /dev/null @@ -1,13 +0,0 @@ -! If you're looking for settings to configure, they won't be saved here until -! you change something in the fluxbox configuration menu. - -session.keyFile: /storage/.fluxbox/keys -session.configVersion: 13 -session.screen0.defaultDeco: NONE -session.screen0.rootCommand: fbsetroot -solid black -session.screen0.autoRaise: True -session.screen0.fullMaximization: True -session.screen0.workspaces: 0 -session.screen0.focusModel: StrictMouseFocus -session.screen0.focusNewWindows: True -session.screen0.focusLastWindow: True diff --git a/packages/x11/other/fluxbox/config/keys b/packages/x11/other/fluxbox/config/keys deleted file mode 100644 index 31ed93445..000000000 --- a/packages/x11/other/fluxbox/config/keys +++ /dev/null @@ -1,19 +0,0 @@ -# This is all we need -# alt-tab -Mod1 Tab :NextWindow {groups} (workspace=[current]) -Mod1 Shift Tab :PrevWindow {groups} (workspace=[current]) - -# current window commands -Mod1 F10 :Maximize -Mod1 F11 :Fullscreen -Mod1 Escape :Close - -# Normal window movement -OnTitlebar Move1 :StartMoving -OnLeftGrip Move1 :StartResizing bottomleft -OnRightGrip Move1 :StartResizing bottomright -OnWindowBorder Move1 :StartMoving - -# alt + left/right click to move/resize a window -OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving} -OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner} diff --git a/packages/x11/other/fluxbox/package.mk b/packages/x11/other/fluxbox/package.mk deleted file mode 100644 index cfc1381b7..000000000 --- a/packages/x11/other/fluxbox/package.mk +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) - -PKG_NAME="fluxbox" -# dont bump or go back to ratpoison then f*** all 3rdparty stuff. -PKG_VERSION="1.3.7" -PKG_SHA256="fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0" -PKG_LICENSE="OSS" -PKG_SITE="http://fluxbox.org/" -PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain libX11 libXrandr libXext libXrender" -PKG_LONGDESC="Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code." -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - --disable-toolbar \ - --disable-slit \ - --disable-systray \ - --enable-ewmh \ - --disable-xpm \ - --disable-xft \ - --disable-fribidi \ - --disable-debug \ - --disable-test \ - --disable-nls \ - --disable-imlib2" - -post_install() { - enable_service windowmanager.service -} - -post_makeinstall_target() { - rm -rf ${INSTALL}/usr/bin/fbrun - rm -rf ${INSTALL}/usr/bin/fbsetbg - rm -rf ${INSTALL}/usr/bin/fluxbox-generate_menu - rm -rf ${INSTALL}/usr/bin/fluxbox-remote - rm -rf ${INSTALL}/usr/bin/startfluxbox - - rm -rf ${INSTALL}/usr/share/fluxbox/styles - - cp ${PKG_DIR}/config/apps ${INSTALL}/usr/share/fluxbox/ - cp ${PKG_DIR}/config/init ${INSTALL}/usr/share/fluxbox/ - cp ${PKG_DIR}/config/keys ${INSTALL}/usr/share/fluxbox/ -} diff --git a/packages/x11/other/fluxbox/patches/fluxbox-01_hack-avoid-potential-SIGFPE-in-Menu-updateMenu.patch b/packages/x11/other/fluxbox/patches/fluxbox-01_hack-avoid-potential-SIGFPE-in-Menu-updateMenu.patch deleted file mode 100644 index 36bb56285..000000000 --- a/packages/x11/other/fluxbox/patches/fluxbox-01_hack-avoid-potential-SIGFPE-in-Menu-updateMenu.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 540dc69955cddd5db24a8a9e16db8162fc0ddd10 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Fri, 25 Apr 2014 13:02:35 +0300 -Subject: [PATCH] hack: avoid potential SIGFPE in Menu::updateMenu() - ---- - src/FbTk/Menu.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff -Naur fluxbox-1.3.7/src/FbTk/Menu.cc fluxbox-1.3.7.patch/src/FbTk/Menu.cc ---- fluxbox-1.3.7/src/FbTk/Menu.cc 2015-02-08 11:44:45.357187009 +0100 -+++ fluxbox-1.3.7.patch/src/FbTk/Menu.cc 2015-02-15 21:37:37.322872231 +0100 -@@ -390,6 +390,7 @@ - } - - void Menu::updateMenu() { -+ return; // because nobody cares - - int bevel = theme()->bevelWidth(); - int bw = theme()->borderWidth(); diff --git a/packages/x11/other/fluxbox/patches/fluxbox-02_hide-useless-errors.patch b/packages/x11/other/fluxbox/patches/fluxbox-02_hide-useless-errors.patch deleted file mode 100644 index 170d9fd93..000000000 --- a/packages/x11/other/fluxbox/patches/fluxbox-02_hide-useless-errors.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 86981018ce0963d93a45270abe379a705a055edf Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Mon, 16 Jun 2014 19:55:02 +0300 -Subject: [PATCH] hide useless errors - ---- - src/FbTk/Resource.cc | 2 -- - src/FbTk/Resource.hh | 2 -- - 2 files changed, 0 insertions(+), 4 deletions(-) - -diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc -index 4be85de..f7c7273 100644 ---- a/src/FbTk/Resource.cc -+++ b/src/FbTk/Resource.cc -@@ -91,8 +91,6 @@ bool ResourceManager::load(const char *filename) { - resource->setFromString(value.addr); - else { - _FB_USES_NLS; -- cerr<<_FBTK_CONSOLETEXT(Error, FailedRead, "Failed to read", "Couldn't load a resource (following)")<<": "<name()<setDefaultValue(); - } - } -diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh -index 8c9d645..348f7e2 100644 ---- a/src/FbTk/Resource.hh -+++ b/src/FbTk/Resource.hh -@@ -216,8 +216,6 @@ void ResourceManager::addResource(Resource &r) { - r.altName().c_str(), &value_type, &value)) { - r.setFromString(value.addr); - } else { -- std::cerr<<"Failed to read: "< -Date: Mon, 2 Nov 2015 15:14:32 -0600 -Subject: fixes bug #1138 - ---- - util/fluxbox-remote.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc -index 59852e6..504015b 100644 ---- a/util/fluxbox-remote.cc -+++ b/util/fluxbox-remote.cc -@@ -73,7 +73,7 @@ int main(int argc, char **argv) { - if (strcmp(cmd, "result") == 0) { - XTextProperty text_prop; - if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 -- && text_prop.value > 0 -+ && text_prop.value != 0 - && text_prop.nitems > 0) { - - printf("%s", text_prop.value); --- -cgit v0.11.2 - diff --git a/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch b/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch deleted file mode 100644 index 19fab5294..000000000 --- a/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur fluxbox-1.3.6/Makefile.am fluxbox-1.3.6.patch/Makefile.am ---- fluxbox-1.3.6/Makefile.am 2015-01-05 15:14:15.320478262 +0100 -+++ fluxbox-1.3.6.patch/Makefile.am 2015-01-10 20:39:20.376934793 +0100 -@@ -79,7 +79,6 @@ - include src/Makemodule.am - include src/tests/Makemodule.am - include util/Makemodule.am --include util/fbrun/Makemodule.am - - uninstall-hook: - rmdir $(DESTDIR)$(pkgdatadir) diff --git a/packages/x11/other/fluxbox/system.d/windowmanager.service b/packages/x11/other/fluxbox/system.d/windowmanager.service deleted file mode 100644 index d97081e2b..000000000 --- a/packages/x11/other/fluxbox/system.d/windowmanager.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Fluxbox Window Manager -Requires=xorg.service -After=xorg.service -Before=kodi.service - -[Service] -Environment=DISPLAY=:0 -Environment=HOME=/storage -ExecStart=/usr/bin/fluxbox -KillMode=process -Restart=always -RestartSec=1 -StartLimitInterval=0 -TimeoutStopSec=1s - -[Install] -WantedBy=graphical.target