Upgraded sqlitestudio to 3.0.7

3 files changed, 31 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21eb125fb21b..72ae162f0efa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sqlitestudio
 	pkgdesc = Database manager for SQLite
-	pkgver = 3.0.6
-	pkgrel = 4
+	pkgver = 3.0.7
+	pkgrel = 1
 	url = http://sqlitestudio.pl/
 	install = sqlitestudio.install
 	arch = i686
@@ -16,18 +16,20 @@ pkgbase = sqlitestudio
 	depends = tcl
 	depends = qt5-script
 	depends = libxkbcommon-x11
-	source = http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.6.tar.gz
+	source = http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.7.tar.gz
 	source = sqlitestudio.desktop
 	source = tclconfig.diff
 	source = utils.diff
 	source = db.diff
 	source = cli_config.diff
-	sha256sums = 7b376b0adb3ec2b284d7dbea3115a436f4d567c1e43e28f36cf872355978b3d5
+	source = dbandroid.diff
+	sha256sums = b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa
 	sha256sums = c5a26a9b9003b04274887a0e0febda13eea49bb46c618eaad0b5b5c88b1cc1d2
 	sha256sums = f63b112d42bc670ab95a264ee1d82acdefad34733c18554b17801fa5c2f56bae
 	sha256sums = 10f8ed73488b30efbcce563fb8dc6bc8b11a6511f42e5e0f8c7f9cab360dd855
 	sha256sums = 6e162788b3df1d60145fe982ce7db1a22dd1ac37f5d100736281e4ccb66510f6
 	sha256sums = 29b7ba8e453ce091f634e5a0a921dd01e5190a34f5a84b670e8ae6c3b820c865
+	sha256sums = 41784cc78f9d5e9a92442942f91d8039e211017e2cde3a043628b623c1ba76da
 
 pkgname = sqlitestudio
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f8e758844c9..b1652a06a0dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
 # Maintainer: Piotr Rogoza <piotr.r.public at gmail dot com>
-# Contributor: Piotr Rogoa <piotr.r.public at gmail dot com>
 
 pkgname=sqlitestudio
 _pkgname=SQLiteStudio
-pkgver=3.0.6
+pkgver=3.0.7
 _pkgver=3
-pkgrel=5
+pkgrel=1
 pkgdesc='Database manager for SQLite'
 arch=(i686 x86_64)
 url='http://sqlitestudio.pl/'
@@ -24,7 +23,6 @@ qt5-svg
 qt5-tools
 )
 install='sqlitestudio.install'
-
 source=(
 http://sqlitestudio.pl/files/sqlitestudio${_pkgver}/complete/tar/sqlitestudio-$pkgver.tar.gz
 sqlitestudio.desktop
@@ -32,32 +30,35 @@ tclconfig.diff
 utils.diff
 db.diff
 cli_config.diff
+dbandroid.diff
 )
-sha256sums=('7b376b0adb3ec2b284d7dbea3115a436f4d567c1e43e28f36cf872355978b3d5'
+sha256sums=('b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa'
             'c5a26a9b9003b04274887a0e0febda13eea49bb46c618eaad0b5b5c88b1cc1d2'
             'f63b112d42bc670ab95a264ee1d82acdefad34733c18554b17801fa5c2f56bae'
             '10f8ed73488b30efbcce563fb8dc6bc8b11a6511f42e5e0f8c7f9cab360dd855'
             '6e162788b3df1d60145fe982ce7db1a22dd1ac37f5d100736281e4ccb66510f6'
-            '29b7ba8e453ce091f634e5a0a921dd01e5190a34f5a84b670e8ae6c3b820c865')
-
+            '29b7ba8e453ce091f634e5a0a921dd01e5190a34f5a84b670e8ae6c3b820c865'
+            '41784cc78f9d5e9a92442942f91d8039e211017e2cde3a043628b623c1ba76da')
 prepare(){
   cd "$srcdir"
   patch -p1 -i tclconfig.diff
   patch -p1 -i utils.diff
   patch -p1 -i db.diff
   patch -p1 -i cli_config.diff
+  patch -p1 -i dbandroid.diff
 
 }
 build(){
   cd "$srcdir"
+  install -dm755 "$srcdir"/output/build/Plugins
 
-  install -dm755 $srcdir/output/build
-  cd $srcdir/output/build
+  msg2 "Making sqlitestudio3"
+  cd "$srcdir"/output/build
   qmake ../../${_pkgname}${_pkgver}
   make
 
-  install -dm755 $srcdir/output/build/Plugins
-  cd $srcdir/output/build/Plugins
+  msg2 "Making plugins for sqlitestudio3"
+  cd "$srcdir"/output/build/Plugins
   qmake ../../../Plugins
   make
 }
@@ -74,4 +75,6 @@ package(){
   # Insecure RPATH
   chrpath -d "$pkgdir"/usr/bin/sqlitestudio
   chrpath -d "$pkgdir"/usr/bin/sqlitestudiocli
+
+  install -Dm755 "$srcdir"/SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.svg "$pkgdir"/usr/share/pixmaps/sqlitestudio.svg
 }
diff --git a/dbandroid.diff b/dbandroid.diff
new file mode 100644
index 000000000000..f17ae80638e5
--- /dev/null
+++ b/dbandroid.diff
@@ -0,0 +1,11 @@
+--- a/Plugins/DbAndroid/DbAndroid.pro
++++ b/Plugins/DbAndroid/DbAndroid.pro
+@@ -6,7 +6,7 @@
+ 
+ QT += widgets network
+ 
+-include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri)
++include($$PWD/../../SQLiteStudio3/plugins.pri)
+ 
+ TARGET = DbAndroid
+ TEMPLATE = lib