summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2015-10-09 21:55:24 +0200
committerPiotr Rogoża2015-10-09 21:55:24 +0200
commit5b938b206e2cdea594105f9caa00361501070e16 (patch)
treeb7e251defab06f07c1db33a6f6a6bd70472c0d9c
parent262f548e3fafbb866472405109e716ce75de13c2 (diff)
downloadaur-5b938b206e2cdea594105f9caa00361501070e16.tar.gz
Added patches from Romzetron for qt 5.5. See http://bugs.sqlitestudio.pl/?id=2870
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--cli_config.diff8
-rw-r--r--db.diff10
-rw-r--r--utils.diff10
5 files changed, 47 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc922f89aae3..21eb125fb21b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sqlitestudio
pkgdesc = Database manager for SQLite
pkgver = 3.0.6
- pkgrel = 3
+ pkgrel = 4
url = http://sqlitestudio.pl/
install = sqlitestudio.install
arch = i686
@@ -19,9 +19,15 @@ pkgbase = sqlitestudio
source = http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.6.tar.gz
source = sqlitestudio.desktop
source = tclconfig.diff
+ source = utils.diff
+ source = db.diff
+ source = cli_config.diff
sha256sums = 7b376b0adb3ec2b284d7dbea3115a436f4d567c1e43e28f36cf872355978b3d5
sha256sums = c5a26a9b9003b04274887a0e0febda13eea49bb46c618eaad0b5b5c88b1cc1d2
sha256sums = f63b112d42bc670ab95a264ee1d82acdefad34733c18554b17801fa5c2f56bae
+ sha256sums = 10f8ed73488b30efbcce563fb8dc6bc8b11a6511f42e5e0f8c7f9cab360dd855
+ sha256sums = 6e162788b3df1d60145fe982ce7db1a22dd1ac37f5d100736281e4ccb66510f6
+ sha256sums = 29b7ba8e453ce091f634e5a0a921dd01e5190a34f5a84b670e8ae6c3b820c865
pkgname = sqlitestudio
diff --git a/PKGBUILD b/PKGBUILD
index e4918dd4906e..dd82504a2850 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sqlitestudio
_pkgname=SQLiteStudio
pkgver=3.0.6
_pkgver=3
-pkgrel=3
+pkgrel=4
pkgdesc='Database manager for SQLite'
arch=(i686 x86_64)
url='http://sqlitestudio.pl/'
@@ -37,14 +37,23 @@ source=(
http://sqlitestudio.pl/files/sqlitestudio${_pkgver}/complete/tar/sqlitestudio-$pkgver.tar.gz
sqlitestudio.desktop
tclconfig.diff
+utils.diff
+db.diff
+cli_config.diff
)
sha256sums=('7b376b0adb3ec2b284d7dbea3115a436f4d567c1e43e28f36cf872355978b3d5'
'c5a26a9b9003b04274887a0e0febda13eea49bb46c618eaad0b5b5c88b1cc1d2'
- 'f63b112d42bc670ab95a264ee1d82acdefad34733c18554b17801fa5c2f56bae')
+ 'f63b112d42bc670ab95a264ee1d82acdefad34733c18554b17801fa5c2f56bae'
+ '10f8ed73488b30efbcce563fb8dc6bc8b11a6511f42e5e0f8c7f9cab360dd855'
+ '6e162788b3df1d60145fe982ce7db1a22dd1ac37f5d100736281e4ccb66510f6'
+ '29b7ba8e453ce091f634e5a0a921dd01e5190a34f5a84b670e8ae6c3b820c865')
prepare(){
cd "$srcdir"
- patch -p1 -i "$srcdir"/tclconfig.diff
+ patch -p1 -i tclconfig.diff
+ patch -p1 -i utils.diff
+ patch -p1 -i db.diff
+ patch -p1 -i cli_config.diff
}
build(){
diff --git a/cli_config.diff b/cli_config.diff
new file mode 100644
index 000000000000..2e13b69e2164
--- /dev/null
+++ b/cli_config.diff
@@ -0,0 +1,8 @@
+--- a/SQLiteStudio3/sqlitestudiocli/cli_config.cpp 2015-10-06 22:16:58.398177090 -0400
++++ b/SQLiteStudio3/sqlitestudiocli/cli_config.cpp 2015-10-06 22:16:50.034980953 -0400
+@@ -1,4 +1,5 @@
+ #include "cli_config.h"
++#include <QDataStream>
+
+ CFG_DEFINE(Cli)
+
diff --git a/db.diff b/db.diff
new file mode 100644
index 000000000000..b1b0ed98832a
--- /dev/null
+++ b/db.diff
@@ -0,0 +1,10 @@
+--- a/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2015-10-06 22:17:08.918004503 -0400
++++ b/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2015-10-06 22:15:58.142498766 -0400
+@@ -1,6 +1,7 @@
+ #include "db.h"
+ #include <QMetaEnum>
+ #include <QDebug>
++#include <QDataStream>
+
+ Db::Db()
+ {
diff --git a/utils.diff b/utils.diff
new file mode 100644
index 000000000000..d0354459e743
--- /dev/null
+++ b/utils.diff
@@ -0,0 +1,10 @@
+--- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2015-10-06 22:17:20.651145333 -0400
++++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2015-10-06 22:16:19.332151242 -0400
+@@ -11,6 +11,7 @@
+ #include <QDebug>
+ #include <QRegularExpression>
+ #include <QDir>
++#include <QDataStream>
+
+ #ifdef Q_OS_LINUX
+ #include <sys/utsname.h>