summaryrefslogtreecommitdiff
path: root/desktop/dmenu
diff options
context:
space:
mode:
authorPhillip Warner <pc_warner@yahoo.com>2012-03-29 23:29:28 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-03-29 23:29:28 -0400
commitd4b2562673274537be82c2257b8487d4a833ef9c (patch)
treef7f85673fc55cba10e31082262aa62ec6a613d09 /desktop/dmenu
parent996b93df623c097b7cce0dbb321a32b8a0ec0101 (diff)
downloadslackbuilds-d4b2562673274537be82c2257b8487d4a833ef9c.tar.gz
desktop/dmenu: Updated for version 4.5.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'desktop/dmenu')
-rw-r--r--desktop/dmenu/README3
-rw-r--r--desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff26
-rw-r--r--desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff27
-rw-r--r--desktop/dmenu/dmenu.SlackBuild10
-rw-r--r--desktop/dmenu/dmenu.info8
-rw-r--r--desktop/dmenu/dmenu_path26
6 files changed, 37 insertions, 63 deletions
diff --git a/desktop/dmenu/README b/desktop/dmenu/README
index 56803cb4a5..7d645f282c 100644
--- a/desktop/dmenu/README
+++ b/desktop/dmenu/README
@@ -1,3 +1,6 @@
dmenu - dynamic menu
dmenu is a generic and efficient menu for X.
+
+Note: dmenu now includes a tiny utility called stest that is used to filter
+files. See its man page for details.
diff --git a/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff
deleted file mode 100644
index e8fe33c223..0000000000
--- a/desktop/dmenu/dmenu-4.3.1-libdir_cflags_fixups.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur dmenu-4.3.1-orig/config.mk dmenu-4.3.1/config.mk
---- dmenu-4.3.1-orig/config.mk 2011-05-18 12:02:16.000000000 -0400
-+++ dmenu-4.3.1/config.mk 2011-06-25 18:13:35.000000000 -0400
-@@ -4,6 +4,7 @@
- # paths
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
-+LIBDIR = /usr/local/lib
-
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -14,11 +15,12 @@
-
- # includes and libs
- INCS = -I${X11INC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
-+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS}
-
- # flags
-+OPTS ?= -Os
- CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS = -ansi -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
- LDFLAGS = -s ${LIBS}
-
- # compiler and linker
diff --git a/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff
new file mode 100644
index 0000000000..b65edb6686
--- /dev/null
+++ b/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff
@@ -0,0 +1,27 @@
+diff -Naur dmenu-4.5-orig/config.mk dmenu-4.5/config.mk
+--- dmenu-4.5-orig/config.mk 2012-01-08 07:18:43.000000000 -0500
++++ dmenu-4.5/config.mk 2012-03-03 13:13:44.000000000 -0500
+@@ -4,6 +4,7 @@
+ # paths
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
++LIBDIR = /usr/local/lib
+
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -14,12 +15,13 @@
+
+ # includes and libs
+ INCS = -I${X11INC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
++LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS}
+
+ # flags
++OPTS ?= -Os
+ CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+-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.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index 6d545e0df9..fde63bbd61 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -24,8 +24,8 @@
# Modified by Phillip Warner for version >= 4.0
PRGNAM=dmenu
-VERSION=4.3.1
-BUILD=${BUILD:-2}
+VERSION=4.5
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,7 +71,7 @@ find . \
-exec chmod 644 {} \;
# Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts
-patch -p1 < $CWD/dmenu-4.3.1-libdir_cflags_fixups.diff
+patch -p1 < $CWD/dmenu-4.5-libdir_cflags_fixups.diff
make install \
OPTS="$SLKCFLAGS" \
@@ -82,10 +82,6 @@ make install \
X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
DESTDIR=$PKG
-# Use older (version 4.1.1) dmenu_path that actually works properly
-# Shouldn't be needed after upstream fixes this
-cat $CWD/dmenu_path > $PKG/usr/bin/dmenu_path
-
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index f1c62bea52..e209a900e8 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,10 +1,10 @@
PRGNAM="dmenu"
-VERSION="4.3.1"
+VERSION="4.5"
HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.3.1.tar.gz"
-MD5SUM="6b619f6901bf4765442b4e410b1e5410"
+DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.5.tar.gz"
+MD5SUM="9c46169ed703732ec52ed946c27d84b4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Phillip Warner"
EMAIL="pc_warner@yahoo.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/desktop/dmenu/dmenu_path b/desktop/dmenu/dmenu_path
deleted file mode 100644
index 7896a9e957..0000000000
--- a/desktop/dmenu/dmenu_path
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-CACHE=$HOME/.dmenu_cache
-IFS=:
-
-uptodate() {
- test -f "$CACHE" &&
- for dir in $PATH
- do
- test ! $dir -nt "$CACHE" || return 1
- done
-}
-
-if ! uptodate
-then
- for dir in $PATH
- do
- cd "$dir" &&
- for file in *
- do
- test -x "$file" && echo "$file"
- done
- done | sort | uniq > "$CACHE".$$ &&
- mv "$CACHE".$$ "$CACHE"
-fi
-
-cat "$CACHE"