From 9ab99c8a3383132c5cf1d1fa34610da09c27010c Mon Sep 17 00:00:00 2001
From: klaatu
Date: Sat, 1 Apr 2017 18:51:50 +0100
Subject: development/sqlitebrowser: New maintainer + switch to i586.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/sqlitebrowser/doinst.sh                |  3 +++
 development/sqlitebrowser/sqlitebrowser.SlackBuild | 21 ++++++++++++++++++---
 development/sqlitebrowser/sqlitebrowser.info       |  6 +++---
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 development/sqlitebrowser/doinst.sh

(limited to 'development/sqlitebrowser')

diff --git a/development/sqlitebrowser/doinst.sh b/development/sqlitebrowser/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/development/sqlitebrowser/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/development/sqlitebrowser/sqlitebrowser.SlackBuild b/development/sqlitebrowser/sqlitebrowser.SlackBuild
index 3ce097641b..c42f24509e 100644
--- a/development/sqlitebrowser/sqlitebrowser.SlackBuild
+++ b/development/sqlitebrowser/sqlitebrowser.SlackBuild
@@ -31,7 +31,7 @@ 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
@@ -42,13 +42,27 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLCKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -57,7 +71,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake
+qmake QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS"
 make LINK="g++ -ldl"
 mkdir -p $PKG/usr/bin
 cp src/$PRGNAM $PKG/usr/bin/
@@ -76,6 +90,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/sqlitebrowser/sqlitebrowser.info b/development/sqlitebrowser/sqlitebrowser.info
index e6f8fdbab7..559249f05c 100644
--- a/development/sqlitebrowser/sqlitebrowser.info
+++ b/development/sqlitebrowser/sqlitebrowser.info
@@ -1,10 +1,10 @@
 PRGNAM="sqlitebrowser"
 VERSION="3.9.1"
 HOMEPAGE="http://sqlitebrowser.org/"
-DOWNLOAD="https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.9.1.tar.gz"
+DOWNLOAD="https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.9.1/sqlitebrowser-3.9.1.tar.gz"
 MD5SUM="edf47a4baa8c53e9151032152e3c2991"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="klaatu"
+EMAIL="klaatu@member.fsf.org"
-- 
cgit v1.2.3