4 files changed, 20 insertions, 52 deletions
diff --git a/development/sqlitebrowser/slack-desc b/development/sqlitebrowser/slack-desc
index 445bfc11dc4a7..58baffc326e1a 100644
--- a/development/sqlitebrowser/slack-desc
+++ b/development/sqlitebrowser/slack-desc
@@ -15,5 +15,5 @@ sqlitebrowser: to create databases, edit and search data using a familiar
 sqlitebrowser: spreadsheet-like interface, without the need to learn complicated SQL
 sqlitebrowser: commands.
 sqlitebrowser:
-sqlitebrowser: Homepage: http://sqlitebrowser.sourceforge.net/
+sqlitebrowser: Homepage: http://sqlitebrowser.org/
 sqlitebrowser:
diff --git a/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch b/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
deleted file mode 100644
index ff6af92372444..0000000000000
--- a/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-As suggested by Andreas Gölzer at http://sourceforge.net/tracker/index.php?func=detail&aid=3096050&group_id=87946&atid=584909
-
---- sqlitebrowser/sqlitedb.h
-+++ sqlitebrowser/sqlitedb.h
-@@ -41,7 +41,7 @@
- class DBBrowserField
-     {    
-     public:
--        DBBrowserField() : name( 0 ) { }
-+        DBBrowserField() : name( "0" ) { }
-         DBBrowserField( const QString& wname,const QString& wtype )
-             : name( wname), type( wtype )
-         { }
-@@ -55,7 +55,7 @@
- class DBBrowserIndex
-     {    
-     public:
--        DBBrowserIndex() : name( 0 ) { }
-+        DBBrowserIndex() : name( "0" ) { }
-        DBBrowserIndex( const QString& wname,const QString& wsql )
-             : name( wname), sql( wsql )
-         { }
-@@ -70,7 +70,7 @@
- class DBBrowserTable
-     {    
-     public:
--        DBBrowserTable() : name( 0 ) { }
-+        DBBrowserTable() : name( "0" ) { }
-         DBBrowserTable( const QString& wname,const QString& wsql )
-             : name( wname), sql( wsql )
-         { }
diff --git a/development/sqlitebrowser/sqlitebrowser.SlackBuild b/development/sqlitebrowser/sqlitebrowser.SlackBuild
index e2f13ead1470e..38df227827a71 100644
--- a/development/sqlitebrowser/sqlitebrowser.SlackBuild
+++ b/development/sqlitebrowser/sqlitebrowser.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for sqlitebrowser
 
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +24,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlitebrowser
-VERSION=${VERSION:-2.0b1}
-BUILD=${BUILD:-3}
+SRCNAM=sqlb
+VERSION=${VERSION:-3.1.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,29 +47,26 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf trunk
-tar xvf $CWD/${PRGNAM}_200_b1_src.tar.gz
-cd trunk/$PRGNAM
+rm -rf $PRGNAM-$SRCNAM-$VERSION
+tar xvf $CWD/${SRCNAM}-$VERSION.tar.gz
+cd $PRGNAM-$SRCNAM-$VERSION
 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 {} \;
-
-# Fix building with Qt 4.7
-patch -p0 < $CWD/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
+ \( -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 {} \;
 
 qmake
 make LINK="g++ -ldl"
 mkdir -p $PKG/usr/bin
-cp $PRGNAM/$PRGNAM $PKG/usr/bin/
+cp src/$PRGNAM $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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PRGNAM/LICENSING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/sqlitebrowser/sqlitebrowser.info b/development/sqlitebrowser/sqlitebrowser.info
index 6af0b952b3d88..5ac14a414f994 100644
--- a/development/sqlitebrowser/sqlitebrowser.info
+++ b/development/sqlitebrowser/sqlitebrowser.info
@@ -1,10 +1,10 @@
 PRGNAM="sqlitebrowser"
-VERSION="2.0b1"
-HOMEPAGE="http://sqlitebrowser.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlitebrowser/sqlitebrowser_200_b1_src.tar.gz"
-MD5SUM="5ca3d41cca454235b93ce72cd585dfe3"
+VERSION="3.1.0"
+HOMEPAGE="http://sqlitebrowser.org/"
+DOWNLOAD="https://github.com/sqlitebrowser/sqlitebrowser/archive/sqlb-3.1.0.tar.gz"
+MD5SUM="17be1cdebcf79a906e6e206fc7cd6cde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Binh Nguyen"
-EMAIL="binhvng@gmail.com"
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"