On Sun, May 31, 2020 at 08:27:42AM +0100, Chris Rawnsley wrote:
> On Sun, 31 May 2020, at 04:34, Lucas wrote:
> > fonts/terminus-font gets pulled in by x11/dmenu because of a
> > customization > patch for look-and-feel.
Whoever imported dmenu and dwm probably felt it was nicer, I don't know,
but I'd say that having less dependencies is favourable; the port is
meant to be customised anyway, so people wanting stuff like fonts can
rather just add it.
> I have felt this pain with x11/dwm as well.
Either ways, those ports should be kept in sync, otherwise dmenu
seemingly integrating with dwm's look would be off.
> They're both suckless projects and you should probably be configuring
> them in the ports tree anyway, however, I would say that I would prefer
> a somewhat useable graphical environment before I've set up ports.
> Terminus at size 8 is not useable on a high DPI monitor...
>
> Further to that, when you do set up the ports tree but forget to comment
> out the terminus dependency then you can expect a very long build.
> Terminus is built from source and brings in a lot of dependencies.
Sound like a valid arguments *against* using such a font to me.
> It's going to be somewhat of a maintainer's prerogative so you might be
> SOL here.
What does "SOL" mean?
Here's a diff to remove terminus-font from both dmenu and dwm; I also
remove myself as maintainer since I no longer use them enough that I
care about future maintainence.
Feedback? OK?
Index: x11/dmenu/Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- x11/dmenu/Makefile 12 Jul 2019 20:51:09 -0000 1.25
+++ x11/dmenu/Makefile 31 May 2020 10:41:36 -0000
@@ -9,8 +9,6 @@ CATEGORIES= x11
HOMEPAGE= https://tools.suckless.org/dmenu
-MAINTAINER= Klemens Nanni <kn@openbsd.org>
-
# MIT/X
PERMIT_PACKAGE= Yes
@@ -18,8 +16,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: x11/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
--- x11/dmenu/patches/patch-config_def_h 10 May 2017 22:06:33 -0000 1.2
+++ x11/dmenu/patches/patch-config_def_h 31 May 2020 10:42:26 -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 */
Index: x11/dwm/Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- x11/dwm/Makefile 12 Jul 2019 20:51:09 -0000 1.34
+++ x11/dwm/Makefile 31 May 2020 10:41:14 -0000
@@ -4,14 +4,12 @@ COMMENT= dynamic window manager
V= 6.2
DISTNAME= dwm-${V}
-REVISION= 0
+REVISION= 1
CATEGORIES= x11
HOMEPAGE= https://dwm.suckless.org/
-MAINTAINER= Klemens Nanni <kn@openbsd.org>
-
# MIT/X
PERMIT_PACKAGE= Yes
@@ -20,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: x11/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
--- x11/dwm/patches/patch-config_def_h 5 Mar 2019 19:35:08 -0000 1.15
+++ x11/dwm/patches/patch-config_def_h 31 May 2020 10:40:41 -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";
No comments:
Post a Comment