Date: Monday, November 9, 2015 @ 11:39:30 Author: spupykin Revision: 146422
upgpkg: dwm 6.1-1 upd Modified: dwm/trunk/PKGBUILD dwm/trunk/config.h ----------+ PKGBUILD | 23 +++++++++++------------ config.h | 28 ++++++++++++++++++---------- 2 files changed, 29 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-09 10:39:26 UTC (rev 146421) +++ PKGBUILD 2015-11-09 10:39:30 UTC (rev 146422) @@ -4,33 +4,32 @@ # Contributor: Grigorios Bouzakis <grb...@gmail.com> pkgname=dwm -pkgver=6.0 -pkgrel=2 +pkgver=6.1 +pkgrel=1 pkgdesc="A dynamic window manager for X" url="http://dwm.suckless.org" arch=('i686' 'x86_64') license=('MIT') options=(zipman) -depends=('libx11' 'libxinerama') +depends=('libx11' 'libxinerama' 'libxft' 'freetype2') install=dwm.install source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz config.h dwm.desktop) -md5sums=('8bb00d4142259beb11e13473b81c0857' - '2453e037f46449774ec8afab49b4f1a2' +md5sums=('f0b6b1093b7207f89c2a90b848c008ec' + '80c4ef2a3eca0fe2d14e2203e3833200' '939f403a71b6e85261d09fc3412269ee') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver cp $srcdir/config.h config.h - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/^CFLAGS = -g/#CFLAGS += -g/g' config.mk - sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk - sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk - sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 } +build() { + cd $srcdir/$pkgname-$pkgver + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2 +} + package() { cd $srcdir/$pkgname-$pkgver make PREFIX=/usr DESTDIR=$pkgdir install Modified: config.h =================================================================== --- config.h 2015-11-09 10:39:26 UTC (rev 146421) +++ config.h 2015-11-09 10:39:30 UTC (rev 146422) @@ -1,7 +1,10 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*"; +static const char *fonts[] = { + "monospace:size=10" +}; +static const char dmenufont[] = "monospace:size=10"; static const char normbordercolor[] = "#444444"; static const char normbgcolor[] = "#222222"; static const char normfgcolor[] = "#bbbbbb"; @@ -10,22 +13,26 @@ static const char selfgcolor[] = "#eeeeee"; static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ -static const Bool showbar = True; /* False means no bar */ -static const Bool topbar = True; /* False means bottom bar */ +static const int showbar = 1; /* 0 means no bar */ +static const int topbar = 1; /* 0 means bottom bar */ /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const Rule rules[] = { + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1 << 8, False, -1 }, + { "Gimp", NULL, NULL, 0, 1, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ +static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const int nmaster = 1; /* number of clients in master area */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const Layout layouts[] = { /* symbol arrange function */ @@ -46,8 +53,9 @@ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* 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 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 Key keys[] = { /* modifier key function argument */