On Sun, May 31, 2020 at 12:37:52PM +0100, Chris Rawnsley wrote:
> I did some digging and it looks like it was dwm's default up until the
> 5.6 release. I guess it was kept around from an abundance of nostalgia.
Much appreciated, thanks.
I tested the update more thoroughly now, fixed a missing REVISION bump
in dmenu and also noticed that dwm passes its fonts to dmenu via command
line, so strictly speaking we wouldn't have to adjust dmenu along with
dwm to ensure the same font across both tools because one already forces
the other; still, I'd like to keep stuff in sync in general.
Updated diff below to drop terminus-font after I already committed my
MAINTAINER drop.
OKs welcome; Unless I hear objections in the next few days, I'll just
go ahead and commit it.
Index: dwm/Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- dwm/Makefile 31 May 2020 11:46:46 -0000 1.35
+++ dwm/Makefile 31 May 2020 11:58:19 -0000
@@ -4,7 +4,7 @@ COMMENT= dynamic window manager
V= 6.2
DISTNAME= dwm-${V}
-REVISION= 1
+REVISION= 2
CATEGORIES= x11
@@ -18,8 +18,7 @@ WANTLIB= X11 Xinerama Xft c fontconfig
MASTER_SITES= https://dl.suckless.org/dwm/
-RUN_DEPENDS= x11/dmenu>=4.6 \
- fonts/terminus-font
+RUN_DEPENDS= x11/dmenu>=4.6
MAKE_ENV= LDFLAGS="${LDFLAGS}" \
X11INC=${X11BASE}/include \
Index: dwm/patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.15
diff -u -p -r1.15 patch-config_def_h
--- dwm/patches/patch-config_def_h 5 Mar 2019 19:35:08 -0000 1.15
+++ dwm/patches/patch-config_def_h 31 May 2020 11:58:19 -0000
@@ -2,19 +2,15 @@ $OpenBSD: patch-config_def_h,v 1.15 2019
Index: config.def.h
--- config.def.h.orig
+++ config.def.h
-@@ -5,17 +5,17 @@ static const unsigned int borderpx = 1; /* bor
- static const unsigned int snap = 32; /* snap pixel */
- static const int showbar = 1; /* 0 means no bar */
+@@ -7,15 +7,15 @@ static const int showbar = 1; /* 0 m
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 *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";
Index: dmenu/Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- dmenu/Makefile 31 May 2020 11:46:46 -0000 1.26
+++ dmenu/Makefile 31 May 2020 11:58:19 -0000
@@ -4,7 +4,7 @@ COMMENT= dynamic menu for X11
V= 4.9
DISTNAME= dmenu-${V}
-REVISION= 0
+REVISION= 1
CATEGORIES= x11
@@ -17,8 +17,6 @@ PERMIT_PACKAGE= Yes
WANTLIB= X11 Xft Xinerama c fontconfig
MASTER_SITES= https://dl.suckless.org/tools/
-
-RUN_DEPENDS= fonts/terminus-font
MAKE_ENV= LDFLAGS="${LDFLAGS}" \
X11INC=${X11BASE}/include \
Index: dmenu/patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_def_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_def_h
--- dmenu/patches/patch-config_def_h 10 May 2017 22:06:33 -0000 1.2
+++ dmenu/patches/patch-config_def_h 31 May 2020 11:58:19 -0000
@@ -1,13 +1,8 @@
$OpenBSD: patch-config_def_h,v 1.2 2017/05/10 22:06:33 jung Exp $
---- config.def.h.orig Mon May 8 19:27:54 2017
-+++ config.def.h Mon May 8 19:27:30 2017
-@@ -4,13 +4,13 @@
- static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
- /* -fn option overrides fonts[0]; default X11 font or font set */
- static const char *fonts[] = {
-- "monospace:size=10"
-+ "terminus:size=8"
- };
+Index: config.def.h
+--- config.def.h.orig
++++ config.def.h
+@@ -9,8 +9,8 @@ static const char *fonts[] = {
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
static const char *colors[SchemeLast][2] = {
/* fg bg */
No comments:
Post a Comment