desktop/dmenu: Updated for version 4.8.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 12 insertions, 85 deletions

diff --git a/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt b/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt
deleted file mode 100644
index fb336373c8..0000000000
--- a/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
-Date: Mon, 9 Nov 2015 00:50:44 +0100
-
-Hi suckless developers!,
-
-After a long time (dwm 4.5 was released on 2012-01-08) it is time for a new
-dmenu release. Thanks goes out to all the people involved at making the software
-better in various ways!
-
-Alot of things have changed, make sure to update your config.h and rebase the
-wiki patches you maintain on dmenu 4.6.
-
-The older wiki patches (specifically pre-4.5 and legacy) and
-functionality that was merged
-(xft) will be removed in a while (few weeks time).
-
-
-Download
-========
-
-dmenu-4.6: http://dl.suckless.org/tools/dmenu-4.6.tar.gz
-SHA1: 16297db470b370a16d532fba3cfd9743758ada80
-
-
-Release notes
-=============
-
-I tried to reconstruct the notes from the git log and give credit to
-the proper authors, there may be some mistakes.
-
-Features:
-  - Now uses Xft for font rendering by default with fallback-font
-support, this also allows anti-aliased fonts and such.
-    The font string matching will be different, check out
-http://www.freedesktop.org/software/fontconfig/fontconfig-user.html
-    for the font string syntax, huge thanks to Eric Pruitt and the
-other people who worked on the dmenu-xft patch (previously on the
-wiki).
-  - Uses a shared libdraw codebase (also used for dwm right now).
-  - Merged wiki patches:
-    - monarg: allow to specify monitor number to start on with -m (Martin Kühl).
-    - multisel: allow selecting multiple items (ctrl-enter) (Evan Gates).
-    - xft: see above.
-  - Accepted vi'is exit approach ^[ (Arkaduisz).
-  - Add ^G escape keybinding (Karl F).
-  - Separate config options to config.h (Alex Sedov).
-  - Support keybind C-S-[jm] (Connor Lane Smith).
-  - stest: get rid of getopt, use suckless arg.h (Hiltjo).
-  - stest: support inverse matching (flag -v) (Martin Kühl).
-
-Notable fixes:
-  - Buffer nul termination on tab (Alex Sedov's).
-  - Crash (pointer dereference) with ctrl-enter as input (Hiltjo).
-  - Ignore prompt if it is empty in addition to NULL (Moritz Wilhelmy).
-  - Incorrect ordering of match results (Davide Del Zompo).
-  - Input text matching (Quentin Rameau).
-  - Paste from clipboard (ctrl+shift+y) (Joshua Lloret).
-  - Replace deprecated usleep() with nanosleep() (Quentin Rameau).
-  - dmenu_run: Split cache logic to dmenu_path again (Quentin Glidic).
-  - multimon: always spawn client on first monitor if specified with
--m 0 (Hiltjo).
-  - reset ControlMask for C-j and C-m (Hiltjo).
-
-Build improvements:
-  - config.mk: add $FREETYPELIBS and $FREETYPEINC, simpler to override
-(ports and *BSDs).
-  - config.mk: improve feature test check (k0ga, stateless).
-  - config.mk: use -std=c99 by default.
-
-Kind regards,
-Hiltjo Posthuma 
diff --git a/desktop/dmenu/dmenu-4.6-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff
index 0690bee294..5c8f5e341a 100644
--- a/desktop/dmenu/dmenu-4.6-libdir_cflags_fixups.diff
+++ b/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff
@@ -1,6 +1,6 @@
-diff -Naur dmenu-4.6-orig/config.mk dmenu-4.6/config.mk
---- dmenu-4.6-orig/config.mk	2015-11-08 17:42:21.000000000 -0500
-+++ dmenu-4.6/config.mk	2015-11-29 17:13:56.521190400 -0500
+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
@@ -18,7 +18,7 @@ diff -Naur dmenu-4.6-orig/config.mk dmenu-4.6/config.mk
  
  # flags
 +OPTS ?= -Os
- CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ 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}
diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index ba19a0a2e8..290289798d 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -24,13 +24,13 @@
 # Modified by Phillip Warner for version >= 4.0
 
 PRGNAM=dmenu
-VERSION=${VERSION:-4.6}
+VERSION=${VERSION:-4.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -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.6-libdir_cflags_fixups.diff
+patch -p1 < $CWD/dmenu-4.8-libdir_cflags_fixups.diff
 
 make install \
   OPTS="$SLKCFLAGS" \
@@ -91,8 +91,6 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Include important changes listed in the release notes in the mailing list group
-cat $CWD/${PRGNAM}-${VERSION}-ReleaseNotes.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ReleaseNotes
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index 48331ea081..04b4630d18 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="dmenu"
-VERSION="4.6"
+VERSION="4.8"
 HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.6.tar.gz"
-MD5SUM="6fedf081133bc0725cb040b3b8ac3fac"
+DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.8.tar.gz"
+MD5SUM="72da14fb2b07c18bc74bffcc19dcaf42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""