Hello community,

here is the log from the commit of package dmenu for openSUSE:Factory checked 
in at 2020-03-05 23:23:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dmenu (Old)
 and      /work/SRC/openSUSE:Factory/.dmenu.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dmenu"

Thu Mar  5 23:23:56 2020 rev:14 rq:781863 version:4.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/dmenu/dmenu.changes      2020-02-25 
16:08:20.168682370 +0100
+++ /work/SRC/openSUSE:Factory/.dmenu.new.26092/dmenu.changes   2020-03-05 
23:24:07.273371595 +0100
@@ -1,0 +2,10 @@
+Thu Mar  5 13:18:45 UTC 2020 - Tomas Cech <[email protected]>
+
+- revert back to 4.8
+  Based on bnc#1164650, fixes in GIT and personal experience - reverting.
+- refresh dmenu-optflags again
+- remove patches:
+    0001-Close-when-the-embedding-window-is-destroyed.patch
+    0002-fix-crash-when-XOpenIM-returns-NULL.patch
+
+-------------------------------------------------------------------

Old:
----
  0001-Close-when-the-embedding-window-is-destroyed.patch
  0002-fix-crash-when-XOpenIM-returns-NULL.patch
  dmenu-4.9.tar.gz

New:
----
  dmenu-4.8.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dmenu.spec ++++++
--- /var/tmp/diff_new_pack.ExcsGN/_old  2020-03-05 23:24:08.401372215 +0100
+++ /var/tmp/diff_new_pack.ExcsGN/_new  2020-03-05 23:24:08.405372217 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           dmenu
-Version:        4.9
+Version:        4.8
 Release:        0
 Summary:        A generic and efficient menu for X
 License:        MIT
@@ -25,8 +25,6 @@
 URL:            https://tools.suckless.org/dmenu/
 Source:         http://dl.suckless.org/tools/%{name}-%{version}.tar.gz
 Patch0:         dmenu-optflags.patch
-Patch1:         0001-Close-when-the-embedding-window-is-destroyed.patch
-Patch2:         0002-fix-crash-when-XOpenIM-returns-NULL.patch
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(x11)

++++++ dmenu-4.9.tar.gz -> dmenu-4.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/LICENSE new/dmenu-4.8/LICENSE
--- old/dmenu-4.9/LICENSE       2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/LICENSE       2018-03-14 20:26:40.000000000 +0100
@@ -1,15 +1,13 @@
 MIT/X Consortium License
 
-© 2006-2019 Anselm R Garbe <[email protected]>
-© 2006-2008 Sander van Dijk <[email protected]>
-© 2006-2007 Michał Janeczek <[email protected]>
-© 2007 Kris Maglione <[email protected]>
+© 2006-2014 Anselm R Garbe <[email protected]>
+© 2010-2012 Connor Lane Smith <[email protected]>
 © 2009 Gottox <[email protected]>
 © 2009 Markus Schnalke <[email protected]>
 © 2009 Evan Gates <[email protected]>
-© 2010-2012 Connor Lane Smith <[email protected]>
-© 2014-2019 Hiltjo Posthuma <[email protected]>
-© 2015-2018 Quentin Rameau <[email protected]>
+© 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+© 2006-2007 Michał Janeczek <janeczek at gmail dot com>
+© 2014-2015 Hiltjo Posthuma <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/Makefile new/dmenu-4.8/Makefile
--- old/dmenu-4.9/Makefile      2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/Makefile      2018-03-14 20:26:40.000000000 +0100
@@ -4,61 +4,71 @@
 include config.mk
 
 SRC = drw.c dmenu.c stest.c util.c
-OBJ = $(SRC:.c=.o)
+OBJ = ${SRC:.c=.o}
 
 all: options dmenu stest
 
 options:
        @echo dmenu build options:
-       @echo "CFLAGS   = $(CFLAGS)"
-       @echo "LDFLAGS  = $(LDFLAGS)"
-       @echo "CC       = $(CC)"
+       @echo "CFLAGS   = ${CFLAGS}"
+       @echo "LDFLAGS  = ${LDFLAGS}"
+       @echo "CC       = ${CC}"
 
 .c.o:
-       $(CC) -c $(CFLAGS) $<
+       @echo CC $<
+       @${CC} -c ${CFLAGS} $<
 
 config.h:
-       cp config.def.h $@
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
 
-$(OBJ): arg.h config.h config.mk drw.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)
+       @echo CC -o $@
+       @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
 
 stest: stest.o
-       $(CC) -o $@ stest.o $(LDFLAGS)
+       @echo CC -o $@
+       @${CC} -o $@ stest.o ${LDFLAGS}
 
 clean:
-       rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
+       @echo cleaning
+       @rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz
 
 dist: clean
-       mkdir -p dmenu-$(VERSION)
-       cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
-               drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
-               dmenu-$(VERSION)
-       tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
-       gzip dmenu-$(VERSION).tar
-       rm -rf dmenu-$(VERSION)
+       @echo creating dist tarball
+       @mkdir -p dmenu-${VERSION}
+       @cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
+               drw.h util.h dmenu_path dmenu_run stest.1 ${SRC} \
+               dmenu-${VERSION}
+       @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
+       @gzip dmenu-${VERSION}.tar
+       @rm -rf dmenu-${VERSION}
 
 install: all
-       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
-       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
+       @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
 
 uninstall:
-       rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
-               $(DESTDIR)$(PREFIX)/bin/dmenu_path\
-               $(DESTDIR)$(PREFIX)/bin/dmenu_run\
-               $(DESTDIR)$(PREFIX)/bin/stest\
-               $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
-               $(DESTDIR)$(MANPREFIX)/man1/stest.1
+       @echo removing executables from ${DESTDIR}${PREFIX}/bin
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
+       @rm -f ${DESTDIR}${PREFIX}/bin/stest
+       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+       @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
 
 .PHONY: all options clean dist install uninstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/config.mk new/dmenu-4.8/config.mk
--- old/dmenu-4.9/config.mk     2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/config.mk     2018-03-14 20:26:40.000000000 +0100
@@ -1,9 +1,9 @@
 # dmenu version
-VERSION = 4.9
+VERSION = 4.8
 
 # paths
 PREFIX = /usr/local
-MANPREFIX = $(PREFIX)/share/man
+MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
@@ -16,16 +16,16 @@
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
-#FREETYPEINC = $(X11INC)/freetype2
+#FREETYPEINC = ${X11INC}/freetype2
 
 # includes and libs
-INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+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_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  = -s ${LIBS}
 
 # compiler and linker
 CC = cc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/dmenu.1 new/dmenu-4.8/dmenu.1
--- old/dmenu-4.9/dmenu.1       2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/dmenu.1       2018-03-14 20:26:40.000000000 +0100
@@ -41,8 +41,8 @@
 dmenu appears at the bottom of the screen.
 .TP
 .B \-f
-dmenu grabs the keyboard before reading stdin if not reading from a tty. This
-is faster, but will lock up X until stdin reaches end\-of\-file.
+dmenu grabs the keyboard before reading stdin.  This is faster, but will lock 
up
+X until stdin reaches end\-of\-file.
 .TP
 .B \-i
 dmenu matches menu items case insensitively.
@@ -106,88 +106,88 @@
 .B Ctrl-Right
 Move cursor to the end of the current word
 .TP
-.B C\-a
+C\-a
 Home
 .TP
-.B C\-b
+C\-b
 Left
 .TP
-.B C\-c
+C\-c
 Escape
 .TP
-.B C\-d
+C\-d
 Delete
 .TP
-.B C\-e
+C\-e
 End
 .TP
-.B C\-f
+C\-f
 Right
 .TP
-.B C\-g
+C\-g
 Escape
 .TP
-.B C\-h
+C\-h
 Backspace
 .TP
-.B C\-i
+C\-i
 Tab
 .TP
-.B C\-j
+C\-j
 Return
 .TP
-.B C\-J
+C\-J
 Shift-Return
 .TP
-.B C\-k
+C\-k
 Delete line right
 .TP
-.B C\-m
+C\-m
 Return
 .TP
-.B C\-M
+C\-M
 Shift-Return
 .TP
-.B C\-n
+C\-n
 Down
 .TP
-.B C\-p
+C\-p
 Up
 .TP
-.B C\-u
+C\-u
 Delete line left
 .TP
-.B C\-w
+C\-w
 Delete word left
 .TP
-.B C\-y
+C\-y
 Paste from primary X selection
 .TP
-.B C\-Y
+C\-Y
 Paste from X clipboard
 .TP
-.B M\-b
+M\-b
 Move cursor to the start of the current word
 .TP
-.B M\-f
+M\-f
 Move cursor to the end of the current word
 .TP
-.B M\-g
+M\-g
 Home
 .TP
-.B M\-G
+M\-G
 End
 .TP
-.B M\-h
+M\-h
 Up
 .TP
-.B M\-j
+M\-j
 Page down
 .TP
-.B M\-k
+M\-k
 Page up
 .TP
-.B M\-l
+M\-l
 Down
 .SH SEE ALSO
 .IR dwm (1),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/dmenu.c new/dmenu-4.8/dmenu.c
--- old/dmenu-4.9/dmenu.c       2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/dmenu.c       2018-03-14 20:26:40.000000000 +0100
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
-#include <unistd.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -145,7 +144,7 @@
        drw_setscheme(drw, scheme[SchemeNorm]);
        drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
 
-       curpos = TEXTW(text) - TEXTW(&text[cursor]);
+       drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
        if ((curpos += lrpad / 2 - 1) < w) {
                drw_setscheme(drw, scheme[SchemeNorm]);
                drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
@@ -309,21 +308,13 @@
 {
        char buf[32];
        int len;
-       KeySym ksym;
+       KeySym ksym = NoSymbol;
        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
-       switch (status) {
-       default: /* XLookupNone, XBufferOverflow */
+       if (status == XBufferOverflow)
                return;
-       case XLookupChars:
-               goto insert;
-       case XLookupKeySym:
-       case XLookupBoth:
-               break;
-       }
-
-       if (ev->state & ControlMask) {
+       if (ev->state & ControlMask)
                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
@@ -361,10 +352,12 @@
                        return;
                case XK_Left:
                        movewordedge(-1);
-                       goto draw;
+                       ksym = NoSymbol;
+                       break;
                case XK_Right:
                        movewordedge(+1);
-                       goto draw;
+                       ksym = NoSymbol;
+                       break;
                case XK_Return:
                case XK_KP_Enter:
                        break;
@@ -374,14 +367,16 @@
                default:
                        return;
                }
-       } else if (ev->state & Mod1Mask) {
+       else if (ev->state & Mod1Mask)
                switch(ksym) {
                case XK_b:
                        movewordedge(-1);
-                       goto draw;
+                       ksym = NoSymbol;
+                       break;
                case XK_f:
                        movewordedge(+1);
-                       goto draw;
+                       ksym = NoSymbol;
+                       break;
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                case XK_h: ksym = XK_Up;    break;
@@ -391,14 +386,13 @@
                default:
                        return;
                }
-       }
-
        switch(ksym) {
        default:
-insert:
                if (!iscntrl(*buf))
                        insert(buf, len);
                break;
+       case NoSymbol:
+               break;
        case XK_Delete:
                if (text[cursor] == '\0')
                        return;
@@ -495,8 +489,6 @@
                match();
                break;
        }
-
-draw:
        drawmenu();
 }
 
@@ -553,7 +545,7 @@
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {
-               if (XFilterEvent(&ev, None))
+               if (XFilterEvent(&ev, win))
                        continue;
                switch(ev.type) {
                case Expose:
@@ -665,7 +657,6 @@
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);
-       XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
        if (embed) {
                XSelectInput(dpy, parentwin, FocusChangeMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
@@ -731,8 +722,6 @@
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
-       if (!XSetLocaleModifiers(""))
-               fputs("warning: no locale modifiers support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
                die("cannot open display");
        screen = DefaultScreen(dpy);
@@ -747,12 +736,7 @@
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 
-#ifdef __OpenBSD__
-       if (pledge("stdio rpath", NULL) == -1)
-               die("pledge");
-#endif
-
-       if (fast && !isatty(0)) {
+       if (fast) {
                grabkeyboard();
                readstdin();
        } else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/dmenu_path new/dmenu-4.8/dmenu_path
--- old/dmenu-4.9/dmenu_path    2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/dmenu_path    2018-03-14 20:26:40.000000000 +0100
@@ -1,10 +1,10 @@
 #!/bin/sh
-
-cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
-cache="$cachedir/dmenu_run"
-
-[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
-
+cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
+if [ -d "$cachedir" ]; then
+       cache=$cachedir/dmenu_run
+else
+       cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
+fi
 IFS=:
 if stest -dqr -n "$cache" $PATH; then
        stest -flx $PATH | sort -u | tee "$cache"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dmenu-4.9/drw.c new/dmenu-4.8/drw.c
--- old/dmenu-4.9/drw.c 2019-02-02 13:55:02.000000000 +0100
+++ new/dmenu-4.8/drw.c 2018-03-14 20:26:40.000000000 +0100
@@ -132,19 +132,6 @@
                die("no font specified.");
        }
 
-       /* Do not allow using color fonts. This is a workaround for a BadLength
-        * error from Xft with color glyphs. Modelled on the Xterm workaround. 
See
-        * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-        * https://lists.suckless.org/dev/1701/30932.html
-        * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
-        * and lots more all over the internet.
-        */
-       FcBool iscol;
-       if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == 
FcResultMatch && iscol) {
-               XftFontClose(drw->dpy, xfont);
-               return NULL;
-       }
-
        font = ecalloc(1, sizeof(Fnt));
        font->xfont = xfont;
        font->pattern = pattern;
@@ -213,7 +200,7 @@
        Clr *ret;
 
        /* need at least two colors for a scheme */
-       if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, 
sizeof(XftColor))))
+       if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, 
sizeof(Clr))))
                return NULL;
 
        for (i = 0; i < clrcount; i++)
@@ -350,7 +337,6 @@
                        fcpattern = FcPatternDuplicate(drw->fonts->pattern);
                        FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-                       FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
 
                        FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);

++++++ dmenu-optflags.patch ++++++
--- /var/tmp/diff_new_pack.ExcsGN/_old  2020-03-05 23:24:08.489372264 +0100
+++ /var/tmp/diff_new_pack.ExcsGN/_new  2020-03-05 23:24:08.489372264 +0100
@@ -1,32 +1,35 @@
-diff -Pdru dmenu-4.9.orig/config.mk dmenu-4.9/config.mk
---- dmenu-4.9.orig/config.mk   2019-02-02 13:55:02.000000000 +0100
-+++ dmenu-4.9/config.mk        2020-01-23 12:44:45.733582828 +0100
-@@ -23,9 +23,9 @@
- LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+Index: dmenu-4.8/config.mk
+===================================================================
+--- dmenu-4.8.orig/config.mk
++++ dmenu-4.8/config.mk
+@@ -23,9 +23,9 @@ 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_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  = -s ${LIBS}
 +CPPFLAGS += -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 +CFLAGS   := $(CFLAGS) -Wall $(INCS) $(CPPFLAGS)
 +LDFLAGS  += $(LIBS)
  
  # compiler and linker
  CC = cc
-diff -Pdru dmenu-4.9.orig/Makefile dmenu-4.9/Makefile
---- dmenu-4.9.orig/Makefile    2019-02-02 13:55:02.000000000 +0100
-+++ dmenu-4.9/Makefile 2020-01-23 12:42:28.519144673 +0100
-@@ -23,10 +23,10 @@
- $(OBJ): arg.h config.h config.mk drw.h
+Index: dmenu-4.8/Makefile
+===================================================================
+--- dmenu-4.8.orig/Makefile
++++ dmenu-4.8/Makefile
+@@ -26,11 +26,11 @@ ${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)
+       @echo CC -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)
+       @echo CC -o $@
+-      @${CC} -o $@ stest.o ${LDFLAGS}
++      @${CC} $(CFLAGS) -o $@ stest.o ${LDFLAGS}
  
  clean:
-       rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
+       @echo cleaning


Reply via email to