desktop/searchmonkey: Updated for version 2.0.0.

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

4 files changed, 82 insertions, 26 deletions

diff --git a/desktop/searchmonkey/searchmonkey-2.0.0-gcc4.7.patch b/desktop/searchmonkey/searchmonkey-2.0.0-gcc4.7.patch
new file mode 100644
index 0000000000..4e6ab56a26
--- /dev/null
+++ b/desktop/searchmonkey/searchmonkey-2.0.0-gcc4.7.patch
@@ -0,0 +1,35 @@
+diff -Naur a/Utility.h b/Utility.h
+--- a/Utility.h	2010-05-16 11:37:32.000000000 +0000
++++ b/Utility.h	2017-06-13 18:55:32.273913477 +0000
+@@ -92,16 +92,6 @@
+     CallEach(observers, searchable, &Subject::Register);

+     here the Subject is the type of Caller

+ */

+-template <typename CalleeContainer, typename Caller, typename Op>

+-void CallEach(const CalleeContainer& container, Caller& caller, Op op)

+-{

+-    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

+-}

+-template <typename T>

+-bool IsValueInRange(T value, T lowerBound, T upperBound)

+-{

+-    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

+-}

+ template <typename T>

+ bool BoundSpecified(T boundValue)

+ {

+@@ -130,4 +120,14 @@
+     return false;

+ }

+ 

++template <typename CalleeContainer, typename Caller, typename Op>

++void CallEach(const CalleeContainer& container, Caller& caller, Op op)

++{

++    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

++}

++template <typename T>

++bool IsValueInRange(T value, T lowerBound, T upperBound)

++{

++    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

++}

+ #endif

diff --git a/desktop/searchmonkey/searchmonkey.SlackBuild b/desktop/searchmonkey/searchmonkey.SlackBuild
index a950fbeca9..b1c2ef0824 100644
--- a/desktop/searchmonkey/searchmonkey.SlackBuild
+++ b/desktop/searchmonkey/searchmonkey.SlackBuild
@@ -22,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=searchmonkey
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-2.0.0}
 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
@@ -39,8 +39,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"
@@ -58,9 +58,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf ${PRGNAM}_v$VERSION
+unzip $CWD/${PRGNAM}_src_v$VERSION.zip
+cd ${PRGNAM}_v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -68,29 +68,40 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+patch -p1 --verbose <$CWD/searchmonkey-2.0.0-gcc4.7.patch
 
+qmake \
+  QMAKE_CFLAGS="$SLKCFLAGS" \
+  QMAKE_CXXFLAGS="$SLKCFLAGS"
 make
-make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/bin $PKG/usr/share/pixmaps \
+ $PKG/usr/share/applications \
+ $PKG/usr/share/icons/hicolor/{16x16,22x22,24x24,32x32,48x48,96x96}/apps
+
+cp searchmonkey $PKG/usr/bin
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cp $PKG/usr/share/pixmaps/searchmonkey/searchmonkey-32x32.png \
-	$PKG/usr/share/pixmaps/searchmonkey/searchmonkey.png
+cp pixmaps/searchmonkey-32x32.png \
+    $PKG/usr/share/pixmaps/searchmonkey.png
+cp pixmaps/searchmonkey-16x16.png \
+    $PKG/usr/share/icons/hicolor/16x16/apps/searchmonkey.png
+cp pixmaps/searchmonkey-22x22.png \
+    $PKG/usr/share/icons/hicolor/22x22/apps/searchmonkey.png
+cp pixmaps/searchmonkey-24x24.png \
+    $PKG/usr/share/icons/hicolor/24x24/apps/searchmonkey.png
+cp pixmaps/searchmonkey-32x32.png \
+    $PKG/usr/share/icons/hicolor/32x32/apps/searchmonkey.png
+cp pixmaps/searchmonkey-48x48.png \
+    $PKG/usr/share/icons/hicolor/48x48/apps/searchmonkey.png
+cp pixmaps/searchmonkey-96x96.png \
+    $PKG/usr/share/icons/hicolor/96x96/apps/searchmonkey.png
+
+cp $CWD/searchmonkey.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING.LESSER ChangeLog INSTALL NEWS 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/searchmonkey/searchmonkey.desktop b/desktop/searchmonkey/searchmonkey.desktop
new file mode 100644
index 0000000000..ea6c7efc08
--- /dev/null
+++ b/desktop/searchmonkey/searchmonkey.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=searchmonkey
+Comment=Find text files quickly using regular expressions
+Exec=searchmonkey
+Icon=searchmonkey
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=System
diff --git a/desktop/searchmonkey/searchmonkey.info b/desktop/searchmonkey/searchmonkey.info
index 41e2a54e02..d321721905 100644
--- a/desktop/searchmonkey/searchmonkey.info
+++ b/desktop/searchmonkey/searchmonkey.info
@@ -1,8 +1,8 @@
 PRGNAM="searchmonkey"
-VERSION="0.8.1"
-HOMEPAGE="https://sourceforge.net/projects/searchmonkey/"
-DOWNLOAD="http://fossies.org/linux/misc/old/searchmonkey-0.8.1.tar.gz"
-MD5SUM="98a822d1569b2e6d744ab4eca75bfa55"
+VERSION="2.0.0"
+HOMEPAGE="http://searchmonkey.embeddediq.com"
+DOWNLOAD="http://searchmonkey.embeddediq.com/download/searchmonkey_src_v2.0.0.zip"
+MD5SUM="239a8171d54c10810da6b131ba5fbd64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""