diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/a/aaa_elflibs/aaa_elflibs.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/aaa_elflibs/symlinks-to-tracked-libs | 1 | ||||
| -rwxr-xr-x | source/a/dialog/dialog.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/d/rust/rust.SlackBuild | 8 | ||||
| -rw-r--r-- | source/d/rust/rust.url | 14 | ||||
| -rw-r--r-- | source/installer/ChangeLog.txt | 3 | ||||
| -rwxr-xr-x | source/installer/build_installer.sh | 2 | ||||
| -rwxr-xr-x | source/l/ncurses/aaa_terminfo.SlackBuild | 2 | ||||
| -rw-r--r-- | source/l/ncurses/doinst.sh | 1 | ||||
| -rwxr-xr-x | source/l/ncurses/ncurses.SlackBuild | 2 | ||||
| -rw-r--r-- | source/l/pulseaudio/doinst.sh | 7 | ||||
| -rwxr-xr-x | source/l/pulseaudio/pulseaudio.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/l/tango-icon-theme/tango-icon-theme.SlackBuild | 3 | ||||
| -rw-r--r-- | source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch | 109 | ||||
| -rwxr-xr-x | source/xap/blackbox/blackbox.SlackBuild | 40 | ||||
| -rw-r--r-- | source/xap/blackbox/blackbox.menu | 221 | ||||
| -rw-r--r-- | source/xap/blackbox/blackbox.url | 1 | ||||
| -rw-r--r-- | source/xap/blackbox/doinst.sh | 13 | ||||
| -rw-r--r-- | source/xap/blackbox/textpropertytostring-unconditional.diff | 28 |
19 files changed, 288 insertions, 179 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 9e5fe9c62..07c990816 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index 7215c44b8..6fb75a2c4 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -2,6 +2,7 @@ # like to keep copies of in the aaa_symlinks package. /lib/libacl.so.1 +/lib/libaio.so.1 /lib/libattr.so.1 /lib/libbz2.so.1 /lib/libbz2.so.1.0 diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild index 1b8c159ba..87ded0946 100755 --- a/source/a/dialog/dialog.SlackBuild +++ b/source/a/dialog/dialog.SlackBuild @@ -22,8 +22,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dialog -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,7 +70,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1 @@ -93,7 +93,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-nls \ --with-ncursesw \ --enable-widec \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make -j4 || exit 1 diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index b6d13762f..131608223 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.26.2} +VERSION=${VERSION:-1.27.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-NO} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.25.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2018-03-29} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.26.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.26.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2018-05-10} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.27.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 13bbdc6be..d3f222990 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.26.2-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.27.0-src.tar.gz gzip -d rustc-*tar.gz plzip -n 6 -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -n 6 -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2018-03-29/cargo-0.26.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2018-03-29/rust-std-1.25.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2018-03-29/rustc-1.25.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/cargo-0.27.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/rust-std-1.26.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/rustc-1.26.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2018-03-29/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2018-03-29/rust-std-1.25.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2018-03-29/rustc-1.25.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/rust-std-1.26.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2018-05-10/rustc-1.26.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index a0e063ada..360391054 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Fri Jun 22 23:38:50 UTC 2018 + Added libaio (needed by lvm). ++--------------------------+ Wed Jun 20 21:08:45 UTC 2018 Upgraded dropbear. Thanks to Robby Workman. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 951977128..6f5502b21 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -833,6 +833,7 @@ ap/terminus-font \ d/gcc \ d/gcc-g++ \ l/glibc \ +l/libaio \ l/libcap \ l/libidn2 \ l/libunistring \ @@ -1082,6 +1083,7 @@ cp -fa${VERBOSE1} $TMP/extract-packages/lib/udev \ cd $TMP/extract-packages/lib${LIBDIRSUFFIX} cp -fa${VERBOSE1} \ e2initrd_helper \ + libaio.so* \ libblkid*so* \ libcap*so* \ libcrypto*so* \ diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild index aab8dc5db..44ac1fc13 100755 --- a/source/l/ncurses/aaa_terminfo.SlackBuild +++ b/source/l/ncurses/aaa_terminfo.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_terminfo # Note the version of ncurses in use: VERSION=${VERSION:-$(PRINT_PACKAGE_NAME=yes ./ncurses.SlackBuild | cut -f 2 -d -)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/l/ncurses/doinst.sh b/source/l/ncurses/doinst.sh index 762cfc7f5..836b4857b 100644 --- a/source/l/ncurses/doinst.sh +++ b/source/l/ncurses/doinst.sh @@ -1,3 +1,4 @@ # Remove possible residue from ncurses-5.x: rm -f usr/lib/libncurses.so.5 rm -f usr/lib/libncursesw.so.5 +# Don't require doinst.sh locking: NOLOCK diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild index 188760785..1aedb9ab9 100755 --- a/source/l/ncurses/ncurses.SlackBuild +++ b/source/l/ncurses/ncurses.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ncurses VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | cut -f 1,2 -d .)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pulseaudio/doinst.sh b/source/l/pulseaudio/doinst.sh index 9b27c9f97..2c0737002 100644 --- a/source/l/pulseaudio/doinst.sh +++ b/source/l/pulseaudio/doinst.sh @@ -34,3 +34,10 @@ chroot . /usr/sbin/usermod -a -G audio pulse 1> /dev/null 2> /dev/null # Make sure the root user is in the audio group: chroot . /usr/sbin/usermod -a -G audio root 1> /dev/null 2> /dev/null +# Recompile glib schemas: +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild index d673783c4..8e0859960 100755 --- a/source/l/pulseaudio/pulseaudio.SlackBuild +++ b/source/l/pulseaudio/pulseaudio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pulseaudio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/tango-icon-theme/tango-icon-theme.SlackBuild b/source/l/tango-icon-theme/tango-icon-theme.SlackBuild index f1647d1c5..36b22d487 100755 --- a/source/l/tango-icon-theme/tango-icon-theme.SlackBuild +++ b/source/l/tango-icon-theme/tango-icon-theme.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tango-icon-theme VERSION=0.8.90 ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -67,6 +67,7 @@ cp -a \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +echo "# Don't require doinst.sh locking: NOLOCK" >> $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/tango-icon-theme-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch b/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch deleted file mode 100644 index 480b99e85..000000000 --- a/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch +++ /dev/null @@ -1,109 +0,0 @@ -http://mirrors.usc.edu/pub/linux/distributions/gentoo/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch - - -diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc ---- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 -+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 -@@ -42,8 +42,9 @@ - - #include <assert.h> - #include <math.h> --#include <stdio.h> --#include <stdlib.h> -+#include <cstdio> -+#include <cstdlib> -+#include <cstring> - - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG -diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc ---- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 -+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 -@@ -28,7 +28,8 @@ - #include <X11/Xlib.h> - #include <X11/Xresource.h> - --#include <stdio.h> -+#include <cstdio> -+#include <cstring> - - - bt::Resource::Resource(void) -diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc ---- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 -+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 -@@ -25,7 +25,8 @@ - #include "Util.hh" - #include "XDG.hh" - --#include <stdlib.h> -+#include <cstdlib> -+#include <algorithm> - - - // make sure directory names end with a slash -diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc ---- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 -+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 -@@ -33,6 +33,8 @@ - #include <X11/Xutil.h> - #include <X11/cursorfont.h> - -+#include <cstring> -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc ---- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 -+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 -@@ -34,7 +34,8 @@ - #include "blackbox.hh" - #include "../version.h" - --#include <stdio.h> -+#include <cstdio> -+#include <cstring> - - - static void showHelp(int exitval) { -diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc ---- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 -+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 -@@ -45,8 +45,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <assert.h> --#include <ctype.h> - #include <dirent.h> -+#include <cctype> -+#include <cstring> - - - static bool running = true; -diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc ---- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 -+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 -@@ -33,6 +33,8 @@ - - #include <assert.h> - -+#include <cstring> -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc ---- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 -+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 -@@ -30,7 +30,9 @@ - #include <cctype> - - #include <X11/Xatom.h> --#include <stdio.h> -+#include <cstdio> -+#include <cstdlib> -+#include <cstring> - - - // ignore all X errors diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index da0f2c30f..84ccdc499 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -20,16 +20,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%200.70.1/blackbox-0.70.1.tar.bz2 # http://downloads.sourceforge.net/project/bbkeys/bbkeys/0.9.1/bbkeys-0.9.1.tar.gz +# https://github.com/bbidulock/blackboxwm cd $(dirname $0) ; CWD=$(pwd) PKGNAM=blackbox -VERSION=${VERSION:-0.70.1} +SRCNAM=blackboxwm +VERSION=${VERSION:-0.73} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-8} -NUMJOBS=${NUMJOBS:-" -j7 "} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -49,6 +49,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j7 "} + # Determine the CFLAGS for the known architectures: case $ARCH in i586) export SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -78,9 +80,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 +rm -rf ${SRCNAM}-${VERSION} +tar xvf $CWD/${SRCNAM}-$VERSION.tar.?z || exit 1 +cd ${SRCNAM}-$VERSION || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -90,11 +92,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Build fix for gcc-4: -zcat $CWD/blackbox-0.70.1-gcc-4.3.patch.gz | patch --verbose -p1 || exit 1 - -# Build fix for libX11-1.5+ -zcat $CWD/textpropertytostring-unconditional.diff.gz | patch --verbose -p1 || exit 1 +autoreconf -vif # Configure: CFLAGS="$SLKCFLAGS" \ @@ -102,12 +100,9 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-shape \ - --enable-slit \ - --enable-interlace \ --enable-nls \ --enable-shared=yes \ --enable-static=no \ - --enable-timed-cache \ --infodir=/usr/info \ --mandir=/usr/man \ --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1 @@ -126,10 +121,14 @@ chmod 755 $PKG/etc/X11/xinit/xinitrc.blackbox zcat $CWD/startblackbox.gz > $PKG/usr/bin/startblackbox chmod 755 $PKG/usr/bin/startblackbox +# Add a default menu that's not useless: +rm -f $PKG/usr/share/blackbox/menu +zcat $CWD/blackbox.menu.gz > $PKG/usr/share/blackbox/menu.new + # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS INSTALL LICENSE README* TODO \ + AUTHORS COMPLIANCE COPYING* NEWS* README* RELNOTES THANKS TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -144,7 +143,7 @@ fi # Compile bbkeys program for blackbox: cd $TMP rm -rf bbkeys-${BBKEYSVER} -tar xvf $CWD/bbkeys-${BBKEYSVER}.tar.xz +tar xvf $CWD/bbkeys-${BBKEYSVER}.tar.?z cd bbkeys-${BBKEYSVER} || exit 1 # Make sure ownerships and permissions are sane: @@ -206,12 +205,9 @@ if [ -d $PKG/usr/man ]; then ) fi -# Set doc permissions: -find $PKG/usr/doc -type f -print0 | xargs -0 chmod 644 -find $PKG/usr/doc -type d -print0 | xargs -0 chmod 755 - mkdir -p $PKG/install -install -vpm644 $CWD/slack-desc $PKG/install/ +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/blackbox/blackbox.menu b/source/xap/blackbox/blackbox.menu new file mode 100644 index 000000000..b75362072 --- /dev/null +++ b/source/xap/blackbox/blackbox.menu @@ -0,0 +1,221 @@ +# This is the default menu file for Blackbox 0.33.0 and up +# +# Lines beginning with the '#' character are ignored. +# +# The new syntax is simpler than the old X resource format... +# Each menu item consists of 2 or 3 fields: +# +# [command] (label) {data} +# +# where [command] is one of: +# +# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] +# [style] [stylesdir] [include] [workspaces] [config] +# +# [begin] is used for the top level menu +# [submenu] is used for submenus +# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop +# reading from the file. +# +# [exec] (label) {string} +# This will insert an item that runs a program. +# +# [exit] (label) +# This will insert an item that exits the window manager. +# +# [reconfig] (label) {string} +# This will insert an item that tells blackbox to re-read it's configuration +# files. {string} is optional, and if supplied, will execute the string with +# /bin/sh -c before the reconfiguration is performed. (this is helpful for +# writing multiple config files and switching between them) +# +# [restart] (label) {string} +# This will insert an item to restart the window manager. {string} is +# optional, and if omitted, blackbox will restart itself. If {string} is +# specified, then a different window manager will be started. +# +# [style] (filename) +# This will insert an item to reconfigure blackbox with the new style. This +# change is saved when blackbox exits or restarts. +# +# [include] (filename) +# This will read more menu items from the file "filename". The file cannot +# contain a [begin] or [end], except for the [end] needed for submenus. +# +# [workspaces] (label) +# This tells Blackbox to insert a "link" to the workspaces menu directly +# into your menu. +# +# [config] (label) +# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu +# allows you to change several options found in your ~/.blackboxrc file on the +# fly. +# +# example: + +[begin] (Blackbox) +[encoding] {UTF-8} + [exec] (urxvt) {urxvt} + [exec] (firefox) {firefox} + [exec] (Run) {fbrun} +[submenu] (Terminals) + [exec] (xterm) {xterm} + [exec] (urxvt) {urxvt} + [exec] (urxvtc) {urxvtc} + [exec] (konsole) {konsole} +[end] +[submenu] (Net) +[submenu] (Browsers) + [exec] (firefox) {firefox} + [exec] (mozilla) {mozilla} + [exec] (seamonkey) {seamonkey} + [exec] (links-graphic) {links -driver x blackbox.org} + [exec] (konqueror) {kfmclient openProfile webbrowsing} + [exec] (links) {urxvt -e links blackbox.org} + [exec] (lynx) {urxvt -e lynx blackbox.org} +[end] +[submenu] (IM) + [exec] (pidgin) {pidgin} + [exec] (kopete) {kopete} +[end] +[submenu] (Mail) + [exec] (kmail) {kmail} + [exec] (thunderbird) {thunderbird} + [exec] (mutt) {urxvt -e mutt} + [exec] (pine) {urxvt -e pine} +[end] +[submenu] (News) + [exec] (pan) {pan} + [exec] (slrn) {urxvt -e slrn} + [exec] (tin) {urxvt -e tin} +[end] +[submenu] (IRC) + [exec] (irssi) {urxvt -e irssi} +[end] +[submenu] (FTP) + [exec] (gftp) {gftp} </usr/share/gftp/gftp.xpm> + [exec] (ncftp) {urxvt -e ncftp} + [exec] (ftp) {urxvt -e ftp} + [exec] (lftp) {urxvt -e lftp} +[end] +[submenu] (Analyzers) + [exec] (xnmap) {xnmap} + [exec] (nmapfe) {nmapfe} +[end] + [exec] (x3270) {x3270} + [exec] (wpa_gui) {wpa_gui} +[end] +[submenu] (Editors) + [exec] (gvim) {gvim} + [exec] (xedit) {xedit} + [exec] (kwrite) {kwrite} + [exec] (kate) {kate} + [exec] (emacs) {emacs} </root/.blackbox/icons/emacs.xpm> + [exec] (evim) {evim} + [exec] (nano) {urxvt -e nano} + [exec] (vim) {urxvt -e vim} + [exec] (vi) {urxvt -e vi} + [exec] (jed) {urxvt -e jed} + [exec] (joe) {urxvt -e joe} + [exec] (emacs-nw) {urxvt -e emacs -nw} </root/.blackbox/icons/emacs.xpm> +[end] +[submenu] (Education) + [exec] (gnuplot) {urxvt -e gnuplot} +[end] +[submenu] (File utils) + [exec] (konqueror) {kfmclient openProfile filemanagement} + [exec] (mc) {urxvt -e mc} +[end] +[submenu] (Multimedia) +[submenu] (Graphics) + [exec] (gimp) {gimp} + [exec] (xv) {xv} + [exec] (xpaint) {xpaint} + [exec] (xscreensaver-demo) {xscreensaver-demo} + [exec] (xlock) {xlock} + [exec] (krita) {krita} + [exec] (Mesa gears) {gears} +[end] +[submenu] (Audio) + [exec] (xmms) {xmms} + [exec] (kmix) {kmix} + [exec] (easytag) {easytag} + [exec] (amarok) {amarok} + [exec] (audacious) {audacious} + [exec] (alsamixer) {urxvt -e alsamixer} +[end] +[submenu] (Video) + [exec] (xine) {xine} + [exec] (gmplayer) {gmplayer} +[end] +[submenu] (X-utils) + [exec] (xfontsel) {xfontsel} + [exec] (xman) {xman} + [exec] (xload) {xload} + [exec] (xbiff) {xbiff} + [exec] (editres) {editres} + [exec] (viewres) {viewres} + [exec] (xclock) {xclock} + [exec] (xmag) {xmag} + [exec] (wmagnify) {wmagnify} + [exec] (gkrellm) {gkrellm} + [exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults} +[end] +[end] +[submenu] (Office) + [exec] (xclock) {xclock} + [exec] (xcalc) {xcalc} + [exec] (kcalc) {kcalc} + [exec] (xpdf) {xpdf} + [exec] (gv) {gv} + [exec] (xfig) {xfig} +[end] +[submenu] (Games) + [exec] (eboard) {eboard} + [exec] (xboard) {xboard} + [exec] (xsnow) {xsnow} + [exec] (xeyes) {xeyes} +[end] +[submenu] (System Tools) +[submenu] (Burning) + [exec] (k3b) {k3b} +[end] + [exec] (top) {urxvt -e top} + [exec] (htop) {urxvt -e htop} +[end] +[submenu] (blackbox menu) + [config] (Configure) +[submenu] (System Styles) {Choose a style...} + [stylesdir] (/usr/share/blackbox/styles) +[end] +[submenu] (User Styles) {Choose a style...} + [stylesdir] (~/.blackbox/styles) +[end] + [workspaces] (Workspace List) +[submenu] (Tools) + [exec] (Window name) {xprop WM_CLASS|cut -d \" -f 2|xmessage -file - -center} + [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} + [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} + [exec] (Run) {fbrun} +[end] +[submenu] (Window Managers) + [restart] (mwm) {mwm} + [restart] (twm) {twm} + [restart] (compiz) {compiz} + [restart] (kde) {startkde} + [restart] (fvwm) {fvwm} + [restart] (xfce4) {startxfce4} + [restart] (fvwm2) {startfvwm2} + [restart] (blackbox) {startblackbox} + [restart] (windowmaker) {wmaker} +[end] + [exec] (Lock screen) {xlock} + [commanddialog] (blackbox Command) + [reconfig] (Reload config) + [restart] (Restart) + [exec] (About) {blackbox -v | xmessage -file - -center} + [separator] + [exit] (Exit) +[end] +[endencoding] +[end] diff --git a/source/xap/blackbox/blackbox.url b/source/xap/blackbox/blackbox.url new file mode 100644 index 000000000..9beb5f04a --- /dev/null +++ b/source/xap/blackbox/blackbox.url @@ -0,0 +1 @@ +https://github.com/bbidulock/blackboxwm diff --git a/source/xap/blackbox/doinst.sh b/source/xap/blackbox/doinst.sh new file mode 100644 index 000000000..910a0011b --- /dev/null +++ b/source/xap/blackbox/doinst.sh @@ -0,0 +1,13 @@ +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config usr/share/blackbox/menu.new diff --git a/source/xap/blackbox/textpropertytostring-unconditional.diff b/source/xap/blackbox/textpropertytostring-unconditional.diff deleted file mode 100644 index ed320388a..000000000 --- a/source/xap/blackbox/textpropertytostring-unconditional.diff +++ /dev/null @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk <jwilk@debian.org> -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include <X11/Xutil.h> -+ - #include <limits.h> - #include <string> - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - |