desktop/j4-dmenu-desktop: Updated for version 2.12.

5 files changed, 58 insertions, 280 deletions

diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1 b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
index 9994141eb6..99c97c3ce5 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
@@ -1,179 +1,42 @@
-.\" 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-07-24" "20140724" "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
+.TH J4\-DMENU\-DESKTOP 1
+.SH NAME
+j4-dmenu-desktop \- faster replacement for i3\-dmenu\-desktop 
+.SH DESCRIPTION
+j4\-dmenu\-desktop is a faster replacement for i3-dmenu-desktop. 
+
+Its purpose is to find .desktop files and offer you a menu to start an 
+application using dmenu.
+
 .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 \fB_TERMINAL_\fR.
-.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.
+.IP
+\fBj4\-dmenu\-desktop\fR [\fB\-\-dmenu\fR="dmenu \-i"] [\fB\-\-term\fR="_TERMINAL_"]
+.SH OPTIONS
+.IP \fB\-\-dmenu=\fR<command>
+Determines the command used to invoke dmenu
+Executed with your shell ($SHELL) or \fI\,/bin/sh\/\fP
+.IP \fB\-\-use\-xdg\-de\fR
+Enables reading $XDG_CURRENT_DESKTOP to determine the desktop environment
+.IP \fB\-\-display\-binary\fR
+Display binary name after each entry (off by default)
+.IP \fB\-\-term=\fR<command>
+Sets the terminal emulator used to start terminal apps
+.IP \fB\-\-help\fR
+Display this help message
+
+.SH "SEE ALSO"
+https://github.com/enkore/j4\-dmenu\-desktop
+.SH COPYRIGHT
+Copyright (C) 2013 enkore <public+j4\-dmenu\-desktop@enkore.de>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index 93dbf04ebb..59c3c05242 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -6,8 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Zip file created with:
-# wget -O j4-dmenu-desktop-$(date +%Y%m%d).zip https://github.com/enkore/j4-dmenu-desktop/archive/master.zip
+# 20150512 bkw:
+# - Update for 2.12 release.
+# - Replace my man page with upstream's (from git).
+# - Escape dashes in terminal name, in man page (MANTERM).
+# - Replace no_interactive_shell.diff with sed -i.
 
 # 20140724 bkw: updated to 20140724 snapshot.
 # - Default to TERMINAL=xterm if i3-sensible-terminal not installed
@@ -21,7 +24,7 @@
 # - Added default terminal selection
 
 PRGNAM=j4-dmenu-desktop
-VERSION=${VERSION:-20140724}
+VERSION=${VERSION:-2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-master
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-master
+rm -rf $PRGNAM-r$VERSION
+tar xvf $CWD/$PRGNAM-r$VERSION.tar.gz || tar xvf $CWD/r$VERSION.tar.gz
+cd $PRGNAM-r$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,7 +74,7 @@ find -L . \
 # the user's choice. bash -i means interactive shell... which causes it to
 # hang if there's no controlling terminal. No idea why upstream wanted the -i
 # option in the first place, I've asked but not gotten an answer.
-patch -p1 < $CWD/no_interactive_shell.diff
+sed -i '/execl(shell/s|"-i", *||' src/*.hh
 
 # For users who don't use i3, let them pick the default terminal.
 # If TERMINAL not set, and i3-sensible-terminal not installed, just
@@ -83,6 +86,7 @@ else
 fi
 
 TERMINAL="${TERMINAL:-$DEFTERM}"
+MANTERM="$( echo $TERMINAL | sed 's,-,\\\\-,g' )"
 echo "Using TERMINAL=$TERMINAL"
 sed -i "s,i3-sensible-terminal,$TERMINAL,g" src/Main.hh
 
@@ -103,13 +107,13 @@ cd build
   install -m0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM
 cd ..
 
-# man page written for this SlackBuild.
+# man page taken from upstream git.
 mkdir -p $PKG/usr/man/man1
-sed "s,_TERMINAL_,$TERMINAL,g" < $CWD/$PRGNAM.1 | \
+sed "s,_TERMINAL_,$MANTERM,g" < $CWD/$PRGNAM.1 | \
   gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG LICENSE README.md $CWD/$PRGNAM.pod $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README* $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 e9457d0aa8..acdf2dd48c 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
@@ -1,8 +1,8 @@
 PRGNAM="j4-dmenu-desktop"
-VERSION="20140724"
+VERSION="2.12"
 HOMEPAGE="http://www.j4tools.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/j4-dmenu-desktop-20140724.zip"
-MD5SUM="698d7ee1ae8e479ba5280af68df0d26f"
+DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.12.tar.gz"
+MD5SUM="89dca54ed781ca7d928bcfe37143c451"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu"
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod
deleted file mode 100644
index d881709ad2..0000000000
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.pod
+++ /dev/null
@@ -1,56 +0,0 @@
-# pod2man --stderr -r20140724 -s1 -cSlackBuilds.org 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 B<_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/no_interactive_shell.diff b/desktop/j4-dmenu-desktop/no_interactive_shell.diff
deleted file mode 100644
index 252130addc..0000000000
--- a/desktop/j4-dmenu-desktop/no_interactive_shell.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur j4-dmenu-desktop-master/src/Applications.hh j4-dmenu-desktop-master.patched/src/Applications.hh
---- j4-dmenu-desktop-master/src/Applications.hh	2014-05-27 07:02:41.000000000 -0400
-+++ j4-dmenu-desktop-master.patched/src/Applications.hh	2014-07-24 15:23:39.000000000 -0400
-@@ -44,10 +44,11 @@
- 		if((shell = getenv("SHELL")) == 0)
- 		    shell = "/bin/sh";
- 		
--		fprintf(stderr, "%s -i -c '%s'\n", shell, choice.c_str());
-+		fprintf(stderr, "%s -c '%s'\n", shell, choice.c_str());
- 		
- 		// -i -c was tested with both bash and zsh.
--		exit(execl(shell, shell, "-i", "-c",  choice.c_str(), 0));
-+		// 20140724 bkw: remove -i, it causes problems.
-+		exit(execl(shell, shell, "-c",  choice.c_str(), 0));
- 	    }
- 
-             // +1 b/c there must be whitespace we add back later...
-diff -Naur j4-dmenu-desktop-master/src/Main.hh j4-dmenu-desktop-master.patched/src/Main.hh
---- j4-dmenu-desktop-master/src/Main.hh	2014-05-27 07:02:41.000000000 -0400
-+++ j4-dmenu-desktop-master.patched/src/Main.hh	2014-07-24 15:28:38.000000000 -0400
-@@ -47,9 +47,10 @@
-             if((shell = getenv("SHELL")) == 0)
-                 shell = "/bin/sh";
- 
--	    fprintf(stderr, "%s -i -c '%s'\n", shell, command.c_str());
-+	    fprintf(stderr, "%s -c '%s'\n", shell, command.c_str());
- 
--            return execl(shell, shell, "-i", "-c", command.c_str(), 0);
-+		 // 20140724 bkw: get rid of -i, it causes problems.
-+            return execl(shell, shell, "-c", command.c_str(), 0);
-         }
-         return 0;
-     }