From b5fda1864297614d467586834468839c625d620c Mon Sep 17 00:00:00 2001
From: TomasM <tomas@slax.org>
Date: Tue, 31 Oct 2017 12:41:25 -0400
Subject: [PATCH] slaxbuilds

---
 Slax/debian/cleanup                           |  2 +
 Slax/debian/modules/chromium                  |  9 ----
 Slax/debian/modules/fluxbox                   | 44 -------------------
 Slax/debian/modules/patches/fluxbox-slax.diff | 15 +++++--
 Slax/debian/modules/xorg                      | 18 --------
 Slax/debian/rootcopy/root/.fluxbox/keys       |  2 +-
 6 files changed, 15 insertions(+), 75 deletions(-)
 delete mode 100644 Slax/debian/modules/chromium
 delete mode 100644 Slax/debian/modules/fluxbox
 delete mode 100644 Slax/debian/modules/xorg

diff --git a/Slax/debian/cleanup b/Slax/debian/cleanup
index 2bd9770..14459d2 100644
--- a/Slax/debian/cleanup
+++ b/Slax/debian/cleanup
@@ -25,6 +25,8 @@ rm -f /var/lib/dhcp/dhclient.leases
 rm -f /root/.bash_history
 rm -f /root/.wget-hsts
 rm -Rf /usr/share/doc/*
+rm -f /usr/share/images/fluxbox/debian-squared.jpg
+rm -Rf /usr/share/fluxbox/nls/??*
 
 rm -Rf /usr/share/locale/??
 rm -Rf /usr/share/locale/??_*
diff --git a/Slax/debian/modules/chromium b/Slax/debian/modules/chromium
deleted file mode 100644
index 9c17559..0000000
--- a/Slax/debian/modules/chromium
+++ /dev/null
@@ -1,9 +0,0 @@
-
-apt-get update
-apt-get install --yes --no-install-recommends chromium
-
-. ../cleanup
-
-rm -Rf /usr/share/icons/gnome/256x256
-
-savechanges /04-chromium.sb
diff --git a/Slax/debian/modules/fluxbox b/Slax/debian/modules/fluxbox
deleted file mode 100644
index 43fabb7..0000000
--- a/Slax/debian/modules/fluxbox
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-CWD=$(dirname $(readlink -f $0))
-
-NAME=fluxbox
-VERSION=1.3.5
-
-# first install stock version
-
-apt-get update
-apt-get install --no-install-recommends --yes $NAME feh
-. ../cleanup
-savechanges /$NAME-stock.sb
-
-cd /
-unsquashfs /$NAME-stock.sb
-
-# then, we want to patch it to implement window resizing!
-# so we will recompile whole package
-
-REBUILD=/tmp/$NAME-rebuild-$$
-
-apt-get update
-apt-get --yes build-dep $NAME
-
-mkdir -p $REBUILD
-cd $REBUILD
-
-apt-get source $NAME
-
-cd $NAME-$VERSION
-
-cat $CWD/patches/fluxbox-slax.diff > debian/patches/fluxbox-slax.diff
-echo fluxbox-slax.diff >> debian/patches/series
-
-dpkg-buildpackage -us -uc
-
-rm -Rf debian/$NAME/DEBIAN
-rm -Rf debian/$NAME/usr/share/doc
-rm -Rf debian/$NAME/usr/share/images
-
-cp debian/$NAME/usr/bin/fluxbox /squashfs-root/usr/bin
-
-savechanges /03-fluxbox.sb /squashfs-root
diff --git a/Slax/debian/modules/patches/fluxbox-slax.diff b/Slax/debian/modules/patches/fluxbox-slax.diff
index 57412a0..39d1b78 100644
--- a/Slax/debian/modules/patches/fluxbox-slax.diff
+++ b/Slax/debian/modules/patches/fluxbox-slax.diff
@@ -27,9 +27,18 @@
      };
  
      // x, y, width and height define a space within which we're drawing a triangle
---- a/src/ToolFactory.cc
-+++ b/src/ToolFactory.cc
-@@ -110,6 +142,9 @@ ToolbarItem *ToolFactory::create(const s
+--- a/src/ToolFactory.cc	2013-02-13 05:04:05.000000000 -0500
++++ b/src/ToolFactory.cc	2017-10-31 12:11:20.000000000 -0400
+@@ -101,6 +101,8 @@
+             cmd_str += " (workspace=[current])";
+         }
+ 
++        if (name.find("menu") != std::string::npos) cmd_str = "Exec fbmenu";
++
+         FbTk::RefCount<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(cmd_str));
+         if (cmd == 0) // we need a command
+             return 0;
+@@ -110,6 +112,9 @@
          if (name.find("prev") != std::string::npos)
              arrow_type = FbTk::FbDrawable::LEFT;
  
diff --git a/Slax/debian/modules/xorg b/Slax/debian/modules/xorg
deleted file mode 100644
index c38e7a5..0000000
--- a/Slax/debian/modules/xorg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-apt-get update
-apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme
-
-# default cursor is white
-ln -sf /etc/X11/cursors/Breeze_Snow.theme /etc/alternatives/x-cursor-theme
-
-cp ../cleanup /tmp
-# install x11 server utils, apt-get would add cpp dependency, bullshit!
-cd /tmp
-apt-get download x11-xserver-utils
-dpkg -x x11-xserver-utils*.deb /tmp/x11utils
-cd /tmp/x11utils
-cp -aR * /
-
-/tmp/cleanup
-
-savechanges /02-xorg.sb
diff --git a/Slax/debian/rootcopy/root/.fluxbox/keys b/Slax/debian/rootcopy/root/.fluxbox/keys
index abaaff4..196cc42 100644
--- a/Slax/debian/rootcopy/root/.fluxbox/keys
+++ b/Slax/debian/rootcopy/root/.fluxbox/keys
@@ -58,7 +58,7 @@ Mod4 8 :Tab 8
 Mod4 9 :Tab 9
 
 # open a terminal
-Mod1 F1 :Exec x-terminal-emulator
+Mod1 F1 :Exec xterm
 
 # open a dialog to run programs
 Mod1 F2 :Exec fbrun