Re: UPDATE: x11/dmenu-4.6 -> 4.7
On Mon, May 08, 2017 at 07:46:31PM +0200, Hiltjo Posthuma wrote:
> Hi,
>
> This bumps dmenu-4.6 to 4.7. It also removes the hardcoded optimization flags
> and removes -s for ld (CFLAGS and LDFLAGS).
>
> Build and tested on amd64.
You dropped the $OpenBSD$ RCS tag from the patches.
I re-added them and committed the update. Thanks!
> diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
> index fdbd700de17..b2935d76e5a 100644
> --- a/x11/dmenu/Makefile
> +++ b/x11/dmenu/Makefile
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.21 2015/11/11 09:23:19 jung Exp $
>
> COMMENT= dynamic menu for X11
> -DISTNAME=dmenu-4.6
> +DISTNAME=dmenu-4.7
>
> CATEGORIES= x11
> HOMEPAGE=http://tools.suckless.org/dmenu
> diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
> index 206fe2d3f0f..c9235f3d091 100644
> --- a/x11/dmenu/distinfo
> +++ b/x11/dmenu/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (dmenu-4.6.tar.gz) = SnokAIpiHDzWVhVa2Rq4E2248NO57Fba/uxRjKvalrM=
> -SIZE (dmenu-4.6.tar.gz) = 15057
> +SHA256 (dmenu-4.7.tar.gz) = p1Y1+NwsvCgN7suQatm3WUxcMWIOSgG6MNyDmEiB97k=
> +SIZE (dmenu-4.7.tar.gz) = 15597
> diff --git a/x11/dmenu/patches/patch-Makefile
> b/x11/dmenu/patches/patch-Makefile
> index 4d49bbc83b4..44dd3aa2e11 100644
> --- a/x11/dmenu/patches/patch-Makefile
> +++ b/x11/dmenu/patches/patch-Makefile
> @@ -1,6 +1,5 @@
> -$OpenBSD: patch-Makefile,v 1.3 2015/11/11 09:23:20 jung Exp $
> Makefile.origSun Nov 8 23:42:21 2015
> -+++ Makefile Tue Nov 10 20:36:13 2015
> +--- Makefile.origMon May 8 19:25:36 2017
> Makefile Mon May 8 19:32:43 2017
> @@ -15,8 +15,7 @@ options:
> @echo "CC = ${CC}"
>
> diff --git a/x11/dmenu/patches/patch-config_def_h
> b/x11/dmenu/patches/patch-config_def_h
> index c92ef7e479f..06e737b92a7 100644
> --- a/x11/dmenu/patches/patch-config_def_h
> +++ b/x11/dmenu/patches/patch-config_def_h
> @@ -1,6 +1,5 @@
> -$OpenBSD: patch-config_def_h,v 1.1 2015/11/11 09:23:20 jung Exp $
> config.def.h.origSun Nov 8 23:42:21 2015
> -+++ config.def.h Wed Nov 11 09:43:27 2015
> +--- config.def.h.origMon 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 */
> @@ -8,15 +7,13 @@ $OpenBSD: patch-config_def_h,v 1.1 2015/11/11 09:23:20 jung
> Exp $
> -"monospace:size=10"
> +"terminus:size=8"
> };
> - static const char *prompt = NULL; /* -p option; prompt to the
> elft of input field */
> --static const char *normbgcolor = "#22"; /* -nb option; normal
> background */
> --static const char *normfgcolor = "#bb"; /* -nf option; normal
> foreground */
> --static const char *selbgcolor = "#005577"; /* -sb option; selected
> background */
> --static const char *selfgcolor = "#ee"; /* -sf option; selected
> foreground */
> -+static const char *normbgcolor = "#202020"; /* -nb option; normal
> background */
> -+static const char *normfgcolor = "#c0c0c0"; /* -nf option; normal
> foreground */
> -+static const char *selbgcolor = "#404040"; /* -sb option; selected
> background */
> -+static const char *selfgcolor = "#f0f0f0"; /* -sf option; selected
> foreground */
> - static const char *outbgcolor = "#00";
> - static const char *outfgcolor = "#00";
> + static const char *prompt = NULL; /* -p option; prompt to the
> left of input field */
> + static const char *colors[SchemeLast][2] = {
> + /* fg bg */
> +-[SchemeNorm] = { "#bb", "#22" },
> +-[SchemeSel] = { "#ee", "#005577" },
> ++[SchemeNorm] = { "#c0c0c0", "#202020" },
> ++[SchemeSel] = { "#f0f0f0", "#404040" },
> + [SchemeOut] = { "#00", "#00" },
> + };
> /* -l option; if nonzero, dmenu uses vertical list with given number of
> lines */
> diff --git a/x11/dmenu/patches/patch-config_mk
> b/x11/dmenu/patches/patch-config_mk
> index 76ff5c0a400..af99873b5d6 100644
> --- a/x11/dmenu/patches/patch-config_mk
> +++ b/x11/dmenu/patches/patch-config_mk
> @@ -1,8 +1,7 @@
> -$OpenBSD: patch-config_mk,v 1.11 2015/11/11 09:23:20 jung Exp $
> config.mk.orig Sun Nov 8 23:42:21 2015
> -+++ config.mkMon Nov 9 20:35:06 2015
> +--- config.mk.orig Mon May 8 19:28:08 2017
> config.mkMon May 8 19:37:38 2017
> @@ -2,11 +2,11 @@
> - VERSION = 4.6
> + VERSION = 4.7
>
> # paths
> -PREFIX = /usr/local
> @@ -17,25 +16,27 @@ $OpenBSD: patch-config_mk,v 1.11 2015/11/11 09:23:20 jung
> Exp $
>
> # Xinerama, comment if you don't want it
> XINERAMALIBS = -lXinerama
> -@@ -14,7 +14,7 @@ XINERAMAFLAGS = -DXINERAMA
> +@@ -14,18 +14,18 @@ XINERAMAFLAGS = -DXINERAMA
>
> # freetype
>
UPDATE: x11/dmenu-4.6 -> 4.7
Hi,
This bumps dmenu-4.6 to 4.7. It also removes the hardcoded optimization flags
and removes -s for ld (CFLAGS and LDFLAGS).
Build and tested on amd64.
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index fdbd700de17..b2935d76e5a 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.21 2015/11/11 09:23:19 jung Exp $
COMMENT= dynamic menu for X11
-DISTNAME= dmenu-4.6
+DISTNAME= dmenu-4.7
CATEGORIES=x11
HOMEPAGE= http://tools.suckless.org/dmenu
diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
index 206fe2d3f0f..c9235f3d091 100644
--- a/x11/dmenu/distinfo
+++ b/x11/dmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmenu-4.6.tar.gz) = SnokAIpiHDzWVhVa2Rq4E2248NO57Fba/uxRjKvalrM=
-SIZE (dmenu-4.6.tar.gz) = 15057
+SHA256 (dmenu-4.7.tar.gz) = p1Y1+NwsvCgN7suQatm3WUxcMWIOSgG6MNyDmEiB97k=
+SIZE (dmenu-4.7.tar.gz) = 15597
diff --git a/x11/dmenu/patches/patch-Makefile b/x11/dmenu/patches/patch-Makefile
index 4d49bbc83b4..44dd3aa2e11 100644
--- a/x11/dmenu/patches/patch-Makefile
+++ b/x11/dmenu/patches/patch-Makefile
@@ -1,6 +1,5 @@
-$OpenBSD: patch-Makefile,v 1.3 2015/11/11 09:23:20 jung Exp $
Makefile.orig Sun Nov 8 23:42:21 2015
-+++ Makefile Tue Nov 10 20:36:13 2015
+--- Makefile.orig Mon May 8 19:25:36 2017
Makefile Mon May 8 19:32:43 2017
@@ -15,8 +15,7 @@ options:
@echo "CC = ${CC}"
diff --git a/x11/dmenu/patches/patch-config_def_h
b/x11/dmenu/patches/patch-config_def_h
index c92ef7e479f..06e737b92a7 100644
--- a/x11/dmenu/patches/patch-config_def_h
+++ b/x11/dmenu/patches/patch-config_def_h
@@ -1,6 +1,5 @@
-$OpenBSD: patch-config_def_h,v 1.1 2015/11/11 09:23:20 jung Exp $
config.def.h.orig Sun Nov 8 23:42:21 2015
-+++ config.def.h Wed Nov 11 09:43:27 2015
+--- 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 */
@@ -8,15 +7,13 @@ $OpenBSD: patch-config_def_h,v 1.1 2015/11/11 09:23:20 jung
Exp $
- "monospace:size=10"
+ "terminus:size=8"
};
- static const char *prompt = NULL; /* -p option; prompt to the elft
of input field */
--static const char *normbgcolor = "#22"; /* -nb option; normal background
*/
--static const char *normfgcolor = "#bb"; /* -nf option; normal foreground
*/
--static const char *selbgcolor = "#005577"; /* -sb option; selected
background */
--static const char *selfgcolor = "#ee"; /* -sf option; selected
foreground */
-+static const char *normbgcolor = "#202020"; /* -nb option; normal background
*/
-+static const char *normfgcolor = "#c0c0c0"; /* -nf option; normal foreground
*/
-+static const char *selbgcolor = "#404040"; /* -sb option; selected
background */
-+static const char *selfgcolor = "#f0f0f0"; /* -sf option; selected
foreground */
- static const char *outbgcolor = "#00";
- static const char *outfgcolor = "#00";
+ static const char *prompt = NULL; /* -p option; prompt to the left
of input field */
+ static const char *colors[SchemeLast][2] = {
+ /* fg bg */
+- [SchemeNorm] = { "#bb", "#22" },
+- [SchemeSel] = { "#ee", "#005577" },
++ [SchemeNorm] = { "#c0c0c0", "#202020" },
++ [SchemeSel] = { "#f0f0f0", "#404040" },
+ [SchemeOut] = { "#00", "#00" },
+ };
/* -l option; if nonzero, dmenu uses vertical list with given number of lines
*/
diff --git a/x11/dmenu/patches/patch-config_mk
b/x11/dmenu/patches/patch-config_mk
index 76ff5c0a400..af99873b5d6 100644
--- a/x11/dmenu/patches/patch-config_mk
+++ b/x11/dmenu/patches/patch-config_mk
@@ -1,8 +1,7 @@
-$OpenBSD: patch-config_mk,v 1.11 2015/11/11 09:23:20 jung Exp $
config.mk.orig Sun Nov 8 23:42:21 2015
-+++ config.mk Mon Nov 9 20:35:06 2015
+--- config.mk.orig Mon May 8 19:28:08 2017
config.mk Mon May 8 19:37:38 2017
@@ -2,11 +2,11 @@
- VERSION = 4.6
+ VERSION = 4.7
# paths
-PREFIX = /usr/local
@@ -17,25 +16,27 @@ $OpenBSD: patch-config_mk,v 1.11 2015/11/11 09:23:20 jung
Exp $
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
-@@ -14,7 +14,7 @@ XINERAMAFLAGS = -DXINERAMA
+@@ -14,18 +14,18 @@ XINERAMAFLAGS = -DXINERAMA
# freetype
FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
+#FREETYPEINC = /usr/include/freetype2
# OpenBSD (uncomment)
- FREETYPEINC = ${X11INC}/freetype2
+-#FREETYPEINC = ${X11INC}/freetype2
++FREETYPEINC = ${X11INC}/freetype2
-@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC}
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11
