7 files changed, 275 insertions, 28 deletions
diff --git a/desktop/j4-dmenu-desktop/README b/desktop/j4-dmenu-desktop/README
index 8a53ae0453a09..d23b69ad53feb 100644
--- a/desktop/j4-dmenu-desktop/README
+++ b/desktop/j4-dmenu-desktop/README
@@ -1,3 +1,11 @@
+j4-dmenu-desktop (dmenu menu generator)
+
 j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose
 is to find .desktop files and offer you a menu to start an application
 using dmenu.
+
+When j4-dmenu-desktop starts an application that runs in a terminal, by
+default it uses i3-sensible-terminal. If you'd rather use a different
+terminal emulator, set TERMINAL in the script's environment. Example:
+
+# TERMINAL=xterm ./j4-dmenu-desktop.SlackBuild
diff --git a/desktop/j4-dmenu-desktop/fix_segfault.diff b/desktop/j4-dmenu-desktop/fix_segfault.diff
deleted file mode 100644
index 32bfca11c8755..0000000000000
--- a/desktop/j4-dmenu-desktop/fix_segfault.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur j4-dmenu-desktop-master/src/desktop.cc j4-dmenu-desktop-master.patched/src/desktop.cc
---- j4-dmenu-desktop-master/src/desktop.cc	2013-05-19 11:46:03.000000000 -0400
-+++ j4-dmenu-desktop-master.patched/src/desktop.cc	2013-06-28 05:39:19.000000000 -0400
-@@ -59,6 +59,7 @@
-             char *key=line, *value;
-             // Split that string in place
-             value = strchr(line, '=');
-+				if(!value) continue;
-             value[0] = 0;
-             value++;
- 
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1 b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
new file mode 100644
index 0000000000000..1bb92f4307e69
--- /dev/null
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
@@ -0,0 +1,179 @@
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+.    ds C`
+.    ds C'
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
+..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
+.\}
+.rr rF
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "J4-DMENU-DESKTOP 1"
+.TH J4-DMENU-DESKTOP 1 "2014-03-10" "20140310" "SlackBuilds.org"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+j4\-dmenu\-desktop \- a faster replacement for i3\-dmenu\-desktop
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBj4\-dmenu\-desktop\fR [\-\-dmenu=\*(L"command\*(R"] [\-\-term=\*(L"command\*(R"] [\-\-display\-binary]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+j4\-dmenu\-desktop is a replacement for i3\-dmenu\-desktop. Its purpose
+is to find .desktop files and offer you a menu to start an application
+using dmenu.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\-\-dmenu=<command>" 4
+.IX Item "--dmenu=<command>"
+Determines the command used to invoke dmenu. Default is \*(L"dmenu
+\&\-i\*(R". Executed with your shell ($SHELL) or /bin/sh.
+.IP "\-\-display\-binary" 4
+.IX Item "--display-binary"
+Display binary name after each entry (off by default).
+.IP "\-\-term=<command>" 4
+.IX Item "--term=<command>"
+Sets the terminal emulator used to start terminal apps. Default is _TERMINAL_.
+.IP "\-\-help" 4
+.IX Item "--help"
+Display help message.
+.SH "FILES"
+.IX Header "FILES"
+.IP "/usr/share/applications/*.desktop" 4
+.IX Item "/usr/share/applications/*.desktop"
+.PD 0
+.ie n .IP "$HOME/.local/share/applications/*.desktop" 4
+.el .IP "\f(CW$HOME\fR/.local/share/applications/*.desktop" 4
+.IX Item "$HOME/.local/share/applications/*.desktop"
+.PD
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+j4\-dmenu\-desktop is copyright (c) 2013 Marian Beermann, GPLv3 license.
+.PP
+This man page written by B. Watson for the SlackBuilds.org project.
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index 782f4eda21313..4dc81a1c6017d 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -9,8 +9,12 @@
 # Zip file created with:
 # wget -O j4-dmenu-desktop-$(date +%Y%m%d).zip https://github.com/enkore/j4-dmenu-desktop/archive/master.zip
 
+# 20140310 bkw: updated to 20140310 snapshot.
+# - Added man page
+# - Added default terminal selection
+
 PRGNAM=j4-dmenu-desktop
-VERSION=${VERSION:-20130628}
+VERSION=${VERSION:-20140310}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,14 +55,19 @@ unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-master
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# for users who don't use i3, let them pick the default terminal.
+TERMINAL="${TERMINAL:-i3-sensible-terminal}"
+sed -i "s,i3-sensible-terminal,$TERMINAL,g" src/Main.hh
 
-# This patch fixes segfaults caused by .desktop files with lines that
-# are missing their = sign. In stock Slackware, gxine.desktop triggers this.
-patch -p1 < $CWD/fix_segfault.diff
+# Don't use 'make install', it wants to run the tests, which require
+# something called 'catch', which isn't shipped in the src (it tries to
+# download it, but fails, and I can't make myself care why). For the same
+# reason, have to use 'make $PRGNAM' instead of plain make.
 
 mkdir -p build
 cd build
@@ -67,12 +76,18 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install/strip DESTDIR=$PKG
+  make $PRGNAM
+  mkdir -p $PKG/usr/bin
+  install -m0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM
 cd ..
 
+# man page written for this SlackBuild.
+mkdir -p $PKG/usr/man/man1
+sed "s,_TERMINAL_,$TERMINAL,g" < $CWD/$PRGNAM.1 | \
+  gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README.md $PRGNAM.pod $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
index dc5acb568c187..8f95b77fd4f7f 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
@@ -1,9 +1,9 @@
 PRGNAM="j4-dmenu-desktop"
-VERSION="20130628"
+VERSION="20140310"
 HOMEPAGE="http://www.j4tools.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/j4-dmenu-desktop-20130628.zip"
-MD5SUM="d7e49eb9b3898bd58d93417714312466"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/j4-dmenu-desktop-20140310.zip"
 DOWNLOAD_x86_64=""
+MD5SUM="0132473fa2fcd03ed4d70d4ec8371890"
 MD5SUM_x86_64=""
 REQUIRES="dmenu"
 MAINTAINER="B. Watson"
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod
new file mode 100644
index 0000000000000..0d92f48a36a83
--- /dev/null
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod
@@ -0,0 +1,56 @@
+# pod2man --stderr -r20140310 -s1 -cSlackBuilds.org -nJ4-DMENU-DESKTOP < j4-dmenu-desktop.pod > j4-dmenu-desktop.1
+
+=pod
+
+=head1 NAME
+
+j4-dmenu-desktop - a faster replacement for i3-dmenu-desktop
+
+=head1 SYNOPSIS
+
+B<j4-dmenu-desktop> [--dmenu="command"] [--term="command"] [--display-binary]
+
+=head1 DESCRIPTION
+
+j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose
+is to find .desktop files and offer you a menu to start an application
+using dmenu.
+
+=head1 OPTIONS
+
+=over
+
+=item --dmenu=<command>
+
+Determines the command used to invoke dmenu. Default is "dmenu
+-i". Executed with your shell ($SHELL) or /bin/sh.
+
+=item --display-binary
+
+Display binary name after each entry (off by default).
+
+=item --term=<command>
+
+Sets the terminal emulator used to start terminal apps. Default is _TERMINAL_.
+
+=item --help
+
+Display help message.
+
+=back
+
+=head1 FILES
+
+=over
+
+=item /usr/share/applications/*.desktop
+
+=item $HOME/.local/share/applications/*.desktop
+
+=back
+
+=head1 AUTHOR
+
+j4-dmenu-desktop is copyright (c) 2013 Marian Beermann, GPLv3 license.
+
+This man page written by B. Watson for the SlackBuilds.org project.
diff --git a/desktop/j4-dmenu-desktop/slack-desc b/desktop/j4-dmenu-desktop/slack-desc
index d5f465eda8530..bc84c2f07c94f 100644
--- a/desktop/j4-dmenu-desktop/slack-desc
+++ b/desktop/j4-dmenu-desktop/slack-desc
@@ -8,9 +8,9 @@
                 |-----handy-ruler------------------------------------------------------|
 j4-dmenu-desktop: j4-dmenu-desktop (dmenu menu generator)
 j4-dmenu-desktop:
-j4-dmenu-desktop: j4-dmenu-desktop is a replacement for i3-dmenu-desktop.
-j4-dmenu-desktop: Its purpose is to find .desktop files and offer you a
-j4-dmenu-desktop: menu to start an application using dmenu.
+j4-dmenu-desktop: j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose
+j4-dmenu-desktop: is to find .desktop files and offer you a menu to start an application
+j4-dmenu-desktop: using dmenu.
 j4-dmenu-desktop:
 j4-dmenu-desktop:
 j4-dmenu-desktop: