diff options
| -rw-r--r-- | desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff | 26 | ||||
| -rw-r--r-- | desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff | 25 | ||||
| -rw-r--r-- | desktop/dmenu/dmenu.SlackBuild | 4 | ||||
| -rw-r--r-- | desktop/dmenu/dmenu.info | 6 |
4 files changed, 30 insertions, 31 deletions
diff --git a/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff deleted file mode 100644 index 5c8f5e341a6c4..0000000000000 --- a/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur dmenu-4.8-orig/config.mk dmenu-4.8/config.mk ---- dmenu-4.8-orig/config.mk 2018-03-14 13:26:40.000000000 -0600 -+++ dmenu-4.8/config.mk 2018-04-01 18:03:50.431134881 -0600 -@@ -4,6 +4,7 @@ - # paths - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man -+LIBDIR = /usr/local/lib - - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib -@@ -20,11 +21,12 @@ - - # includes and libs - INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - - # flags -+OPTS ?= -Os - 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} -+CFLAGS = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS} - LDFLAGS = -s ${LIBS} - - # compiler and linker diff --git a/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff new file mode 100644 index 0000000000000..8618a911dea1f --- /dev/null +++ b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff @@ -0,0 +1,25 @@ +--- dmenu-4.9-orig/config.mk 2019-02-02 05:55:02.000000000 -0700 ++++ dmenu-4.9/config.mk 2020-04-19 13:12:15.427727907 -0600 +@@ -4,6 +4,7 @@ + # paths + PREFIX = /usr/local + MANPREFIX = $(PREFIX)/share/man ++LIBDIR = /usr/local/lib + + X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib +@@ -20,11 +21,12 @@ + + # includes and libs + INCS = -I$(X11INC) -I$(FREETYPEINC) +-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) ++LIBS = -L$(LIBDIR) -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + + # flags ++OPTS ?= -Os + 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) ++CFLAGS = -std=c99 -pedantic -Wall $(OPTS) $(INCS) $(CPPFLAGS) + LDFLAGS = $(LIBS) + + # compiler and linker diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild index 290289798db35..f251b62b8a4d4 100644 --- a/desktop/dmenu/dmenu.SlackBuild +++ b/desktop/dmenu/dmenu.SlackBuild @@ -24,7 +24,7 @@ # Modified by Phillip Warner for version >= 4.0 PRGNAM=dmenu -VERSION=${VERSION:-4.8} +VERSION=${VERSION:-4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +71,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts -patch -p1 < $CWD/dmenu-4.8-libdir_cflags_fixups.diff +patch -p1 < $CWD/dmenu-4.9-libdir_cflags_fixups.diff make install \ OPTS="$SLKCFLAGS" \ diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info index 04b4630d18571..1eaa82ac0077c 100644 --- a/desktop/dmenu/dmenu.info +++ b/desktop/dmenu/dmenu.info @@ -1,8 +1,8 @@ PRGNAM="dmenu" -VERSION="4.8" +VERSION="4.9" HOMEPAGE="http://tools.suckless.org/dmenu" -DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.8.tar.gz" -MD5SUM="72da14fb2b07c18bc74bffcc19dcaf42" +DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.9.tar.gz" +MD5SUM="9a537ec9a3a2ce9f08963d66b56cc030" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |