This is a bugfix and cleanup release.
Pledge and Makefile diff are now upstreamed.
cb3f58a Prepare 6.2 release.
b69c870 pledge: add rpath promise for the ugly Xft font fallback
e78b4a9 Makefile: just show the compiler output
3cd4023 Do not strip at link stage
f40f86f Pledge on OpenBSD
c3a2e01 config.def.h: ClkTagBar missing from comment
c8e9479 Function declarations in correct order.
10dfa65 remove old TODO and BUGS entries
3bd8466 update README: remove mentioning the old dextra repo
76c8c16 All functions in alphabetical order except for this one.
3cb3483 ColBorder has been moved to the enum with ColFg and ColBg.
db22360 dont NUL terminate _NET_WM_NAME
3756f7f sync dmenu drw.{c,h} code: use Clr* (was Scm)
99f78fa gettextprop: check result of XGetTextProperty (undefined behaviour for
XFree)
a9b6a31 Set class name on status bar
6aa8e37 simplify isfixed conditions
ceac8c9 yet another cleanup
5b238c8 Don't restrict snap in mousemove
022d076 Button passthrough when client is not focused
2952b68 cleanup
bb3bd6f applied Markus' tagset purge of alternative view on _NET_ACTIVE_WINDOW
event
e63bf22 applied Ivan Delalande's NET_SUPPORTING_WM_CHECK patch for gtk3
compatibility
5376947 applied Ian Remmler's man page adjustment suggestions
975c898 applied Markus' decouple color-scheme patch
a137a86 applied Markus' clarify status text padding patch
839c7f6 LICENSE: update people
7a59cd1 dwm.1: add keybinding for spawning dmenu
24849ac die() on calloc failure
ab9571b die() consistency: always add newline
56a31dc config.def.h: style improvement, use color Scheme enum
7af4d43 import new drw from libsl and minor fixes.
cd2d754 Configure geometry before applying rules
3465bed fix fullscreen clients not resized on X display resolution change
4ec3a67 Shut up glibc about _BSD_SOURCE being deprecated
Works fine for me with and without custom patches on top.
tedu's chromium diff is already in.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 5 Feb 2019 20:02:29 -0000 1.31
+++ Makefile 5 Feb 2019 20:17:56 -0000
@@ -2,9 +2,8 @@
COMMENT= dynamic window manager
-V= 6.1
+V= 6.2
DISTNAME= dwm-${V}
-REVISION= 3
CATEGORIES= x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 11 Nov 2015 09:27:13 -0000 1.19
+++ distinfo 5 Feb 2019 20:17:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
-SIZE (dwm-6.1.tar.gz) = 25887
+SHA256 (dwm-6.2.tar.gz) = l5AuLgB6rqo8bjvtH4F4W4F7dBOUfx2x07YrjaTNEQ4=
+SIZE (dwm-6.2.tar.gz) = 25273
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 22 May 2018 13:30:57 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.5 2018/05/22 13:30:57 kn Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -15,8 +15,7 @@ options:
- @echo "CC = ${CC}"
-
- .c.o:
-- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ ${CC} -c ${CFLAGS} $<
-
- ${OBJ}: config.h config.mk
-
-@@ -25,8 +24,7 @@ config.h:
- @cp config.def.h $@
-
- dwm: ${OBJ}
-- @echo CC -o $@
-- @${CC} -o $@ ${OBJ} ${LDFLAGS}
-+ ${CC} -o $@ ${OBJ} ${LDFLAGS}
-
- clean:
- @echo cleaning
Index: patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.13
diff -u -p -r1.13 patch-config_def_h
--- patches/patch-config_def_h 5 Feb 2019 20:02:29 -0000 1.13
+++ patches/patch-config_def_h 5 Feb 2019 20:17:56 -0000
@@ -1,31 +1,29 @@
$OpenBSD: patch-config_def_h,v 1.13 2019/02/05 20:02:29 kn Exp $
---- config.def.h.orig Sun Nov 8 23:39:37 2015
-+++ config.def.h Wed Nov 11 09:50:09 2015
-@@ -2,15 +2,15 @@
-
- /* appearance */
- static const char *fonts[] = {
-- "monospace:size=10"
-+ "terminus:size=8"
- };
--static const char dmenufont[] = "monospace:size=10";
--static const char normbordercolor[] = "#444444";
--static const char normbgcolor[] = "#222222";
--static const char normfgcolor[] = "#bbbbbb";
--static const char selbordercolor[] = "#005577";
--static const char selbgcolor[] = "#005577";
--static const char selfgcolor[] = "#eeeeee";
-+static const char dmenufont[] = "terminus:size=8";
-+static const char normbordercolor[] = "#404040";
-+static const char normbgcolor[] = "#202020";
-+static const char normfgcolor[] = "#c0c0c0";
-+static const char selbordercolor[] = "#8888ff";
-+static const char selbgcolor[] = "#404040";
-+static const char selfgcolor[] = "#f0f0f0";
- static const unsigned int borderpx = 1; /* border pixel of windows */
+Index: config.def.h
+--- config.def.h.orig
++++ config.def.h
+@@ -5,13 +5,13 @@ static const unsigned int borderpx = 1; /* bor
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
-@@ -27,6 +27,9 @@ static const Rule rules[] = {
+ static const int topbar = 1; /* 0 means bottom bar */
+-static const char *fonts[] = { "monospace:size=10" };
+-static const char dmenufont[] = "monospace:size=10";
+-static const char col_gray1[] = "#222222";
+-static const char col_gray2[] = "#444444";
+-static const char col_gray3[] = "#bbbbbb";
+-static const char col_gray4[] = "#eeeeee";
+-static const char col_cyan[] = "#005577";
++static const char *fonts[] = { "terminus:size=8" };
++static const char dmenufont[] = "terminus:size=8";
++static const char col_gray1[] = "#202020";
++static const char col_gray2[] = "#404040";
++static const char col_gray3[] = "#c0c0c0";
++static const char col_gray4[] = "#f0f0f0";
++static const char col_cyan[] = "#404040";
+ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+@@ -29,6 +29,9 @@ static const Rule rules[] = {
/* class instance title tags mask isfloating
monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
@@ -35,10 +33,10 @@ $OpenBSD: patch-config_def_h,v 1.13 2019
};
/* layout(s) */
-@@ -55,7 +57,7 @@ static const Layout layouts[] = {
+@@ -57,7 +60,7 @@ static const Layout layouts[] = {
/* 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 *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn",
dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf",
col_gray4, NULL };
-static const char *termcmd[] = { "st", NULL };
+static const char *termcmd[] = { "xterm", NULL };
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
retrieving revision 1.12
diff -u -p -r1.12 patch-config_mk
--- patches/patch-config_mk 3 Jun 2018 16:57:12 -0000 1.12
+++ patches/patch-config_mk 5 Feb 2019 20:17:56 -0000
@@ -2,17 +2,23 @@ $OpenBSD: patch-config_mk,v 1.12 2018/06
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC}
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+@@ -18,7 +18,7 @@ XINERAMAFLAGS = -DXINERAMA
+ FREETYPELIBS = -lfontconfig -lXft
+ FREETYPEINC = /usr/include/freetype2
+ # OpenBSD (uncomment)
+-#FREETYPEINC = ${X11INC}/freetype2
++FREETYPEINC = ${X11INC}/freetype2
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+@@ -27,8 +27,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
# flags
--CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\"
${XINERAMAFLAGS}
-+CPPFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\"
${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS}
${CPPFLAGS}
--LDFLAGS = -s ${LIBS}
-+CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS}
${CPPFLAGS}
-+LDFLAGS += ${LIBS}
+-LDFLAGS = ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS}
${CPPFLAGS}
++LDFLAGS += ${LIBS}
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
Index: patches/patch-dwm_1
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-dwm_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-dwm_1
--- patches/patch-dwm_1 24 Oct 2016 22:46:54 -0000 1.2
+++ patches/patch-dwm_1 5 Feb 2019 20:17:56 -0000
@@ -1,21 +1,22 @@
$OpenBSD: patch-dwm_1,v 1.2 2016/10/24 22:46:54 czarkoff Exp $
---- dwm.1.orig Wed Nov 11 09:50:32 2015
-+++ dwm.1 Wed Nov 11 09:51:25 2015
-@@ -57,7 +57,7 @@ click on a tag label adds/removes that tag to/from the
+Index: dwm.1
+--- dwm.1.orig
++++ dwm.1
+@@ -58,7 +58,7 @@ click on a tag label adds/removes that tag to/from the
.TP
.B Mod1\-Shift\-Return
Start
-.BR st(1).
+.BR xterm (1).
.TP
- .B Mod1\-,
- Focus previous screen, if any.
-@@ -151,7 +151,7 @@ dwm is customized by creating a custom config.h and (r
+ .B Mod1\-p
+ Spawn
+@@ -157,7 +157,7 @@ dwm is customized by creating a custom config.h and (r
code. This keeps it fast, secure and simple.
.SH SEE ALSO
.BR dmenu (1),
-.BR st (1)
+.BR xterm (1)
- .SH BUGS
+ .SH ISSUES
Java applications which use the XToolkit/XAWT backend may draw grey windows
only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and
early
Index: patches/patch-dwm_c
===================================================================
RCS file: patches/patch-dwm_c
diff -N patches/patch-dwm_c
--- patches/patch-dwm_c 3 Jun 2018 17:00:14 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-dwm_c,v 1.2 2018/06/03 17:00:14 kn Exp $
-
-Index: dwm.c
---- dwm.c.orig
-+++ dwm.c
-@@ -2133,6 +2133,8 @@ main(int argc, char *argv[])
- die("dwm: cannot open display\n");
- checkotherwm();
- setup();
-+ if (pledge("stdio rpath proc exec", NULL) == -1)
-+ die("pledge\n");
- scan();
- run();
- cleanup();
