Ondřej Súkup
f7a1da0701
- update to 4.9 * Use slow path if stdin is a tty * Use bold for keyboard shortcuts in dmenu.1 * Fix cursor drawn position with wide glyphs OBS-URL: https://build.opensuse.org/request/show/827309 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/dmenu?expand=0&rev=21
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
Index: dmenu-4.9/config.mk
|
|
===================================================================
|
|
--- dmenu-4.9.orig/config.mk
|
|
+++ dmenu-4.9/config.mk
|
|
@@ -23,9 +23,10 @@ INCS = -I$(X11INC) -I$(FREETYPEINC)
|
|
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
|
|
|
# flags
|
|
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
|
-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
|
|
-LDFLAGS = $(LIBS)
|
|
+CPPFLAGS += -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
|
+CFLAGS := $(CFLAGS) -Wall $(INCS) $(CPPFLAGS)
|
|
+LDFLAGS += $(LIBS)
|
|
+
|
|
|
|
# compiler and linker
|
|
CC = cc
|
|
Index: dmenu-4.9/Makefile
|
|
===================================================================
|
|
--- dmenu-4.9.orig/Makefile
|
|
+++ dmenu-4.9/Makefile
|
|
@@ -23,10 +23,10 @@ config.h:
|
|
$(OBJ): arg.h config.h config.mk drw.h
|
|
|
|
dmenu: dmenu.o drw.o util.o
|
|
- $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
|
|
+ $(CC) $(CFLAGS) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
|
|
|
|
stest: stest.o
|
|
- $(CC) -o $@ stest.o $(LDFLAGS)
|
|
+ $(CC) $(CFLAGS) -o $@ stest.o $(LDFLAGS)
|
|
|
|
clean:
|
|
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
|