update dmenu to 4.6
ok sthen kili
This commit is contained in:
jung
parent
39ad32740a
commit
fc2300e5bc
@ -1,8 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2013/03/11 11:46:08 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2015/11/11 09:23:19 jung Exp $
|
||||
|
||||
COMMENT= dynamic menu for X11
|
||||
DISTNAME= dmenu-4.5
|
||||
REVISION= 0
|
||||
DISTNAME= dmenu-4.6
|
||||
|
||||
CATEGORIES= x11
|
||||
HOMEPAGE= http://tools.suckless.org/dmenu
|
||||
@ -12,10 +11,12 @@ MAINTAINER= Jim Razmus II <jim@openbsd.org>
|
||||
# MIT/X
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= X11 Xinerama c
|
||||
WANTLIB= X11 Xinerama c Xft fontconfig
|
||||
|
||||
MASTER_SITES= http://dl.suckless.org/tools/
|
||||
|
||||
RUN_DEPENDS= fonts/terminus-font
|
||||
|
||||
FAKE_FLAGS= DESTDIR=""
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (dmenu-4.5.tar.gz) = CCzWmNghJcoLOYkAb7hKxGdcKlWFv1u4rw6gnPuVqFA=
|
||||
SIZE (dmenu-4.5.tar.gz) = 11543
|
||||
SHA256 (dmenu-4.6.tar.gz) = SnokAIpiHDzWVhVa2Rq4E2248NO57Fba/uxRjKvalrM=
|
||||
SIZE (dmenu-4.6.tar.gz) = 15057
|
||||
|
||||
@ -1,24 +1,56 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2012/05/01 04:40:03 gsoares Exp $
|
||||
--- Makefile.orig Tue Apr 3 12:17:59 2012
|
||||
+++ Makefile Tue Apr 3 12:19:29 2012
|
||||
@@ -16,17 +16,17 @@ options:
|
||||
$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
|
||||
@@ -15,8 +15,7 @@ options:
|
||||
@echo "CC = ${CC}"
|
||||
|
||||
.c.o:
|
||||
@echo CC -c $<
|
||||
- @${CC} -c $< ${CFLAGS}
|
||||
+ ${CC} -c $< ${CFLAGS}
|
||||
- @echo CC $<
|
||||
- @${CC} -c ${CFLAGS} $<
|
||||
+ ${CC} -c ${CFLAGS} $<
|
||||
|
||||
${OBJ}: config.mk draw.h
|
||||
config.h:
|
||||
@echo creating $@ from config.def.h
|
||||
@@ -25,12 +24,10 @@ config.h:
|
||||
${OBJ}: arg.h config.h config.mk drw.h
|
||||
|
||||
dmenu: dmenu.o draw.o
|
||||
@echo CC -o $@
|
||||
- @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
|
||||
+ ${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
|
||||
dmenu: dmenu.o drw.o util.o
|
||||
- @echo CC -o $@
|
||||
- @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
|
||||
+ ${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
|
||||
|
||||
stest: stest.o
|
||||
@echo CC -o $@
|
||||
- @echo CC -o $@
|
||||
- @${CC} -o $@ stest.o ${LDFLAGS}
|
||||
+ ${CC} -o $@ stest.o ${LDFLAGS}
|
||||
|
||||
clean:
|
||||
@echo cleaning
|
||||
@@ -47,19 +44,14 @@ dist: clean
|
||||
@rm -rf dmenu-${VERSION}
|
||||
|
||||
install: all
|
||||
- @echo installing executables to ${DESTDIR}${PREFIX}/bin
|
||||
- @mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
- @cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
|
||||
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
|
||||
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
|
||||
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
|
||||
- @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
|
||||
- @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
|
||||
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
- @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
|
||||
- @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
|
||||
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
|
||||
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
|
||||
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_PROGRAM} dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
|
||||
+ sed "s/VERSION/${VERSION}/g" < dmenu.1 > dmenu.1.tmp
|
||||
+ sed "s/VERSION/${VERSION}/g" < stest.1 > stest.1.tmp
|
||||
+ mv dmenu.1.tmp dmenu.1
|
||||
+ mv stest.1.tmp stest.1
|
||||
+ ${BSD_INSTALL_MAN} dmenu.1 stest.1 ${DESTDIR}${MANPREFIX}/man1
|
||||
|
||||
uninstall:
|
||||
@echo removing executables from ${DESTDIR}${PREFIX}/bin
|
||||
|
||||
22
x11/dmenu/patches/patch-config_def_h
Normal file
22
x11/dmenu/patches/patch-config_def_h
Normal file
@ -0,0 +1,22 @@
|
||||
$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
|
||||
@@ -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"
|
||||
};
|
||||
static const char *prompt = NULL; /* -p option; prompt to the elft of input field */
|
||||
-static const char *normbgcolor = "#222222"; /* -nb option; normal background */
|
||||
-static const char *normfgcolor = "#bbbbbb"; /* -nf option; normal foreground */
|
||||
-static const char *selbgcolor = "#005577"; /* -sb option; selected background */
|
||||
-static const char *selfgcolor = "#eeeeee"; /* -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 = "#00ffff";
|
||||
static const char *outfgcolor = "#000000";
|
||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares Exp $
|
||||
--- config.mk.orig Sun Jan 8 10:18:43 2012
|
||||
+++ config.mk Tue Apr 3 12:08:37 2012
|
||||
$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
|
||||
@@ -2,11 +2,11 @@
|
||||
VERSION = 4.5
|
||||
VERSION = 4.6
|
||||
|
||||
# paths
|
||||
-PREFIX = /usr/local
|
||||
@ -17,17 +17,25 @@ $OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares Exp $
|
||||
|
||||
# Xinerama, comment if you don't want it
|
||||
XINERAMALIBS = -lXinerama
|
||||
@@ -17,10 +17,10 @@ INCS = -I${X11INC}
|
||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
|
||||
@@ -14,7 +14,7 @@ XINERAMAFLAGS = -DXINERAMA
|
||||
|
||||
# freetype
|
||||
FREETYPELIBS = -lfontconfig -lXft
|
||||
-FREETYPEINC = /usr/include/freetype2
|
||||
+#FREETYPEINC = /usr/include/freetype2
|
||||
# OpenBSD (uncomment)
|
||||
FREETYPEINC = ${X11INC}/freetype2
|
||||
|
||||
@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC}
|
||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
||||
|
||||
# flags
|
||||
-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
||||
-CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||
-LDFLAGS = -s ${LIBS}
|
||||
+CFLAGS += ${INCS} ${CPPFLAGS}
|
||||
+LDFLAGS += ${LIBS}
|
||||
+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
+CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||
+LDFLAGS += -s ${LIBS}
|
||||
|
||||
# compiler and linker
|
||||
-CC = cc
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-dmenu_c,v 1.1 2012/11/05 13:14:23 zinke Exp $
|
||||
--- dmenu.c.orig Fri Nov 2 13:18:33 2012
|
||||
+++ dmenu.c Fri Nov 2 13:19:46 2012
|
||||
@@ -45,10 +45,10 @@ static int inputw, promptw;
|
||||
static size_t cursor = 0;
|
||||
static const char *font = NULL;
|
||||
static const char *prompt = NULL;
|
||||
-static const char *normbgcolor = "#222222";
|
||||
-static const char *normfgcolor = "#bbbbbb";
|
||||
-static const char *selbgcolor = "#005577";
|
||||
-static const char *selfgcolor = "#eeeeee";
|
||||
+static const char *normbgcolor = "#202020";
|
||||
+static const char *normfgcolor = "#c0c0c0";
|
||||
+static const char *selbgcolor = "#404040";
|
||||
+static const char *selfgcolor = "#f0f0f0";
|
||||
static unsigned int lines = 0;
|
||||
static unsigned long normcol[ColLast];
|
||||
static unsigned long selcol[ColLast];
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2012/05/01 04:40:03 gsoares Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2015/11/11 09:23:20 jung Exp $
|
||||
@bin bin/dmenu
|
||||
bin/dmenu_path
|
||||
bin/dmenu_run
|
||||
@bin bin/stest
|
||||
@man man/man1/dmenu.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user