diff options
| -rw-r--r-- | desktop/dwm/README | 5 | ||||
| -rw-r--r-- | desktop/dwm/README.CONFIG | 13 | ||||
| -rw-r--r-- | desktop/dwm/dwm.SlackBuild | 21 | ||||
| -rw-r--r-- | desktop/dwm/dwm.info | 6 | ||||
| -rw-r--r-- | desktop/dwm/patches/st.patch | 11 | ||||
| -rw-r--r-- | desktop/dwm/patches/use_uxterm_instead_of_st.patch | 11 |
6 files changed, 40 insertions, 27 deletions
diff --git a/desktop/dwm/README b/desktop/dwm/README index 2d265f98df..77a1a928c2 100644 --- a/desktop/dwm/README +++ b/desktop/dwm/README @@ -3,4 +3,9 @@ floating layouts. Either layout can be applied dynamically, optimizing the environment for the application in use and the task performed. It is the little brother of wmii. +As of 6.1, `st` is the default terminal. This does not require +installing `st`, only symlinking your favorite terminal to: + + /usr/local/bin/st + See README.CONFIG for more information. diff --git a/desktop/dwm/README.CONFIG b/desktop/dwm/README.CONFIG index bbd139540a..2114820081 100644 --- a/desktop/dwm/README.CONFIG +++ b/desktop/dwm/README.CONFIG @@ -49,20 +49,23 @@ tarball. Place any patches in the patches/ directory before starting the SlackBuild script. A sample patch is included that will change -the default terminal from 'uxterm' to 'st'. -This video shows how I created the patch: +the default terminal from 'st' to 'uxterm'. +This video shows one method of patch creation: + +https://asciinema.org/a/30752 + +Here is an older video on patch creation: https://asciinema.org/a/7886 Example: -$ cd dwm-6.0 +$ cd dwm-6.1 $ cp config.def.h config.h $ vi config.h [make customizations] -$ diff -u config.h config.def.h >> ../patches/config.patch +$ diff -u config.h config.def.h > ../patches/awesome_changes.patch $ cd .. $ sh dwm.SlackBuild - diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild index ea2c5a2696..7173b901cf 100644 --- a/desktop/dwm/dwm.SlackBuild +++ b/desktop/dwm/dwm.SlackBuild @@ -1,8 +1,7 @@ #!/bin/sh - # Slackware build script for dwm - -# Copyright 2014 Ryan P.C. McQuen, WA, ryan.q@linux.com +# +# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com # # With permission of original maintainer Tom Canich. # All rights reserved. @@ -34,8 +33,8 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dwm -VERSION=${VERSION:-6.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -74,12 +73,18 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION mv config.def.h config.h +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ### Per community request, this section has been restored ### for those that wish to include custom patches. ### A sample patch is included in the patches/ directory -### that will change the default terminal from 'uxterm' -### to 'st'. -Ryan +### that will change the default terminal from 'st' +### to 'uxterm'. -Ryan # #for i in $(ls $CWD/patches); do # patch -p0 < $CWD/patches/$i @@ -104,7 +109,7 @@ make install \ mkdir -p $PKG/etc/X11/xinit install -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/desktop/dwm/dwm.info b/desktop/dwm/dwm.info index f7160002b3..8967703ee7 100644 --- a/desktop/dwm/dwm.info +++ b/desktop/dwm/dwm.info @@ -1,8 +1,8 @@ PRGNAM="dwm" -VERSION="6.0" +VERSION="6.1" HOMEPAGE="http://dwm.suckless.org" -DOWNLOAD="http://dl.suckless.org/dwm/dwm-6.0.tar.gz" -MD5SUM="8bb00d4142259beb11e13473b81c0857" +DOWNLOAD="http://dl.suckless.org/dwm/dwm-6.1.tar.gz" +MD5SUM="f0b6b1093b7207f89c2a90b848c008ec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/dwm/patches/st.patch b/desktop/dwm/patches/st.patch deleted file mode 100644 index c647a1009a..0000000000 --- a/desktop/dwm/patches/st.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h 2014-04-17 21:48:40.014970116 -0700 -+++ st.h 2014-04-17 21:48:55.490969058 -0700 -@@ -47,7 +47,7 @@ - - /* commands */ - static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; --static const char *termcmd[] = { "uxterm", NULL }; -+static const char *termcmd[] = { "st", NULL }; - - static Key keys[] = { - /* modifier key function argument */ diff --git a/desktop/dwm/patches/use_uxterm_instead_of_st.patch b/desktop/dwm/patches/use_uxterm_instead_of_st.patch new file mode 100644 index 0000000000..c45aa6b981 --- /dev/null +++ b/desktop/dwm/patches/use_uxterm_instead_of_st.patch @@ -0,0 +1,11 @@ +--- config.def.h 2015-11-08 14:39:37.000000000 -0800 ++++ config.h 2015-11-27 09:35:45.456371304 -0800 +@@ -55,7 +55,7 @@ + /* commands */ + static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ + static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +-static const char *termcmd[] = { "st", NULL }; ++static const char *termcmd[] = { "uxterm", NULL }; + + static Key keys[] = { + /* modifier key function argument */ |