[arch-commits] Commit in skrooge/repos (16 files)
Jaroslav Lichtblau
jlichtblau at archlinux.org
Sun Oct 2 20:37:55 UTC 2016
Date: Sunday, October 2, 2016 @ 20:37:54
Author: jlichtblau
Revision: 191233
archrelease: copy trunk to community-i686, community-x86_64
Added:
skrooge/repos/community-i686/PKGBUILD
(from rev 191232, skrooge/trunk/PKGBUILD)
skrooge/repos/community-i686/skrooge-qt57.patch
(from rev 191232, skrooge/trunk/skrooge-qt57.patch)
skrooge/repos/community-i686/skrooge.changelog
(from rev 191232, skrooge/trunk/skrooge.changelog)
skrooge/repos/community-i686/skrooge.install
(from rev 191232, skrooge/trunk/skrooge.install)
skrooge/repos/community-x86_64/PKGBUILD
(from rev 191232, skrooge/trunk/PKGBUILD)
skrooge/repos/community-x86_64/skrooge-qt57.patch
(from rev 191232, skrooge/trunk/skrooge-qt57.patch)
skrooge/repos/community-x86_64/skrooge.changelog
(from rev 191232, skrooge/trunk/skrooge.changelog)
skrooge/repos/community-x86_64/skrooge.install
(from rev 191232, skrooge/trunk/skrooge.install)
Deleted:
skrooge/repos/community-i686/PKGBUILD
skrooge/repos/community-i686/skrooge-qt57.patch
skrooge/repos/community-i686/skrooge.changelog
skrooge/repos/community-i686/skrooge.install
skrooge/repos/community-x86_64/PKGBUILD
skrooge/repos/community-x86_64/skrooge-qt57.patch
skrooge/repos/community-x86_64/skrooge.changelog
skrooge/repos/community-x86_64/skrooge.install
-------------------------------------+
/PKGBUILD | 90 ++++++
/skrooge-qt57.patch | 462 ++++++++++++++++++++++++++++++++++
/skrooge.changelog | 154 +++++++++++
/skrooge.install | 22 +
community-i686/PKGBUILD | 45 ---
community-i686/skrooge-qt57.patch | 231 -----------------
community-i686/skrooge.changelog | 74 -----
community-i686/skrooge.install | 11
community-x86_64/PKGBUILD | 45 ---
community-x86_64/skrooge-qt57.patch | 231 -----------------
community-x86_64/skrooge.changelog | 74 -----
community-x86_64/skrooge.install | 11
12 files changed, 728 insertions(+), 722 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-i686/PKGBUILD 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: neuromante <lorenzo.nizzi.grifi at gmail.com>
-
-pkgname=skrooge
-pkgver=2.4.0
-pkgrel=3
-pkgdesc="A personal finances manager for KDE"
-arch=('i686' 'x86_64')
-url="http://skrooge.org/"
-license=('GPL')
-depends=('qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'qt5-webkit' 'libofx' 'grantlee-qt5'
- 'kross' 'knewstuff' 'krunner' 'knotifyconfig' 'kdelibs4support' 'sqlcipher')
-makedepends=('cmake' 'kdoctools' 'extra-cmake-modules' 'python' 'kdesignerplugin' 'patch')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
- skrooge-qt57.patch)
-sha256sums=('132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe'
- '3d86a4f4933fffceb5bb7dc5b2ecd1cc69713c5fe87eb4097b2d2c4bfa3ef3f2')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
- patch -Np1 -i "${srcdir}"/$pkgname-qt57.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- export
- cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` \
- -DKDE_INSTALL_QTPLUGINDIR=`kf5-config --qt-plugins` \
- -DKDE_INSTALL_LIBDIR=/usr/lib
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: skrooge/repos/community-i686/PKGBUILD (from rev 191232, skrooge/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: neuromante <lorenzo.nizzi.grifi at gmail.com>
+
+pkgname=skrooge
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="A personal finances manager for KDE"
+arch=('i686' 'x86_64')
+url="http://skrooge.org/"
+license=('GPL')
+depends=('qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'qt5-webkit' 'libofx' 'grantlee'
+ 'kross' 'knewstuff' 'krunner' 'knotifyconfig' 'kdelibs4support' 'sqlcipher')
+makedepends=('cmake' 'kdoctools' 'extra-cmake-modules' 'python' 'kdesignerplugin' 'patch')
+options=('!emptydirs')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
+ skrooge-qt57.patch)
+sha256sums=('97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d'
+ '3d86a4f4933fffceb5bb7dc5b2ecd1cc69713c5fe87eb4097b2d2c4bfa3ef3f2')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+# patch -Np1 -i "${srcdir}"/$pkgname-qt57.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ export
+ cmake . -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` \
+ -DKDE_INSTALL_QTPLUGINDIR=`kf5-config --qt-plugins` \
+ -DKDE_INSTALL_LIBDIR=/usr/lib
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/skrooge-qt57.patch
===================================================================
--- community-i686/skrooge-qt57.patch 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-i686/skrooge-qt57.patch 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,231 +0,0 @@
-diff --git a/skgbasemodeler/skgdefine.h b/skgbasemodeler/skgdefine.h
-index 5c0a207..7a216ae 100644
---- a/skgbasemodeler/skgdefine.h
-+++ b/skgbasemodeler/skgdefine.h
-@@ -28,6 +28,7 @@
-
- #include "skgbasemodeler_export.h"
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-
- template <typename T> struct QAddConst {
- typedef const T Type;
-@@ -37,6 +38,8 @@ template <typename T> struct QAddConst {
- template <typename T>
- Q_DECL_CONSTEXPR typename QAddConst<T>::Type& qAsConst(T& t) Q_DECL_NOTHROW { return t; }
-
-+#endif
-+
- /**
- * @var OBJECTSEPARATOR
- * Define the separator between object and subobject
-diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
-index cec76e9..5fb275a 100644
---- a/skgbasemodeler/skgdocument.cpp
-+++ b/skgbasemodeler/skgdocument.cpp
-@@ -854,7 +854,8 @@ QStringList SKGDocument::getImpactedViews(const QString& iTable)
- for (int i = 0; i < l.count(); ++i) { // Warning: the size of l will change in the loop
- QString item = l.at(i);
- if (m_ImpactedViews.contains(item)) {
-- for (const auto& name : qAsConst(m_ImpactedViews.value(item)))
-+ QStringList impactedView = m_ImpactedViews.value(item);
-+ for (const auto& name : qAsConst(impactedView))
- if (!l.contains(name)) {
- l.push_back(name);
- }
-diff --git a/skgsqlcipher/qsql_sqlite.cpp b/skgsqlcipher/qsql_sqlite.cpp
-index 482cd35..ee1fcf6 100644
---- a/skgsqlcipher/qsql_sqlite.cpp
-+++ b/skgsqlcipher/qsql_sqlite.cpp
-@@ -130,7 +130,10 @@ protected:
- void virtual_hook(int id, void* data) Q_DECL_OVERRIDE;
-
- private:
-- QSQLiteResultPrivate* d;
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-+ QSQLiteResultPrivate* d_ptr;
-+#endif
-+ Q_DECLARE_PRIVATE(QSQLiteResult)
- };
-
- class QSQLiteDriverPrivate : public QSqlDriverPrivate
-@@ -145,17 +148,25 @@ public:
- };
-
-
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+class QSQLiteResultPrivate : public QSqlCachedResultPrivate
-+#else
- class QSQLiteResultPrivate
-+#endif
- {
- public:
-- QSQLiteResultPrivate(QSQLiteResult* res);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv);
-+#else
-+ QSQLiteResultPrivate(QSQLiteResult *res);
-+ QSQLiteResult* q_ptr;
-+#endif
- void cleanup();
- bool fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch);
- // initializes the recordInfo and the cache
- void initColumns(bool emptyResultset);
- void finalize();
-
-- QSQLiteResult* q;
- sqlite3* access;
-
- sqlite3_stmt* stmt;
-@@ -164,15 +175,27 @@ public:
- bool skipRow; // skip the next fetchNext()?
- QSqlRecord rInf;
- QVector<QVariant> firstRow;
-+
-+ Q_DECLARE_PUBLIC(QSQLiteResult)
- };
-
--QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
-- stmt(0), skippedStatus(false), skipRow(false)
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv)
-+ : QSqlCachedResultPrivate(res, drv)
-+#else
-+QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res)
-+ : q_ptr(res)
-+#endif
-+ , access(0)
-+ , stmt(0)
-+ , skippedStatus(false)
-+ , skipRow(false)
- {
- }
-
- void QSQLiteResultPrivate::cleanup()
- {
-+ Q_Q(QSQLiteResult);
- finalize();
- rInf.clear();
- skippedStatus = false;
-@@ -194,6 +217,7 @@ void QSQLiteResultPrivate::finalize()
-
- void QSQLiteResultPrivate::initColumns(bool emptyResultset)
- {
-+ Q_Q(QSQLiteResult);
- int nCols = sqlite3_column_count(stmt);
- if (nCols <= 0) {
- return;
-@@ -246,6 +270,8 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
-
- bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch)
- {
-+ Q_Q(QSQLiteResult);
-+
- int res;
- int i;
-
-@@ -352,21 +378,29 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int i
- }
-
- QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db)
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ : QSqlCachedResult(*new QSQLiteResultPrivate(this, db))
-+#else
- : QSqlCachedResult(db)
-+ , d_ptr(new QSQLiteResultPrivate(this))
-+#endif
- {
-- d = new QSQLiteResultPrivate(this);
-+ Q_D(QSQLiteResult);
- d->access = db->d_func()->access;
- const_cast<QSQLiteDriverPrivate*>(db->d_func())->results.append(this);
- }
-
- QSQLiteResult::~QSQLiteResult()
- {
-+ Q_D(QSQLiteResult);
- const QSqlDriver* sqlDriver = driver();
- if (sqlDriver) {
- const_cast<QSQLiteDriverPrivate*>(qobject_cast<const QSQLiteDriver*>(sqlDriver)->d_func())->results.removeOne(this);
- }
- d->cleanup();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
- delete d;
-+#endif
- }
-
- void QSQLiteResult::virtual_hook(int id, void* data)
-@@ -384,6 +418,7 @@ bool QSQLiteResult::reset(const QString& query)
-
- bool QSQLiteResult::prepare(const QString& query)
- {
-+ Q_D(QSQLiteResult);
- if (!driver() || !driver()->isOpen() || driver()->isOpenError()) {
- return false;
- }
-@@ -418,6 +453,7 @@ bool QSQLiteResult::prepare(const QString& query)
-
- bool QSQLiteResult::exec()
- {
-+ Q_D(QSQLiteResult);
- const QVector<QVariant> values = boundValues();
-
- d->skippedStatus = false;
-@@ -515,7 +551,7 @@ bool QSQLiteResult::exec()
-
- bool QSQLiteResult::gotoNext(QSqlCachedResult::ValueCache& row, int idx)
- {
-- return d->fetchNext(row, idx, false);
-+ return d_func()->fetchNext(row, idx, false);
- }
-
- int QSQLiteResult::size()
-@@ -525,13 +561,13 @@ int QSQLiteResult::size()
-
- int QSQLiteResult::numRowsAffected()
- {
-- return sqlite3_changes(d->access);
-+ return sqlite3_changes(d_func()->access);
- }
-
- QVariant QSQLiteResult::lastInsertId() const
- {
- if (isActive()) {
-- qint64 id = sqlite3_last_insert_rowid(d->access);
-+ qint64 id = sqlite3_last_insert_rowid(d_func()->access);
- if (id) {
- return id;
- }
-@@ -544,19 +580,19 @@ QSqlRecord QSQLiteResult::record() const
- if (!isActive() || !isSelect()) {
- return QSqlRecord();
- }
-- return d->rInf;
-+ return d_func()->rInf;
- }
-
- void QSQLiteResult::detachFromResultSet()
- {
-- if (d->stmt) {
-- sqlite3_reset(d->stmt);
-+ if (d_func()->stmt) {
-+ sqlite3_reset(d_func()->stmt);
- }
- }
-
- QVariant QSQLiteResult::handle() const
- {
-- return QVariant::fromValue(d->stmt);
-+ return QVariant::fromValue(d_func()->stmt);
- }
-
- /////////////////////////////////////////////////////////
-@@ -668,7 +704,7 @@ void QSQLiteDriver::close()
- Q_D(QSQLiteDriver);
- if (isOpen()) {
- foreach (QSQLiteResult* result, d->results) {
-- result->d->finalize();
-+ result->d_func()->finalize();
- }
-
- if (sqlite3_close(d->access) != SQLITE_OK)
Copied: skrooge/repos/community-i686/skrooge-qt57.patch (from rev 191232, skrooge/trunk/skrooge-qt57.patch)
===================================================================
--- community-i686/skrooge-qt57.patch (rev 0)
+++ community-i686/skrooge-qt57.patch 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,231 @@
+diff --git a/skgbasemodeler/skgdefine.h b/skgbasemodeler/skgdefine.h
+index 5c0a207..7a216ae 100644
+--- a/skgbasemodeler/skgdefine.h
++++ b/skgbasemodeler/skgdefine.h
+@@ -28,6 +28,7 @@
+
+ #include "skgbasemodeler_export.h"
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+
+ template <typename T> struct QAddConst {
+ typedef const T Type;
+@@ -37,6 +38,8 @@ template <typename T> struct QAddConst {
+ template <typename T>
+ Q_DECL_CONSTEXPR typename QAddConst<T>::Type& qAsConst(T& t) Q_DECL_NOTHROW { return t; }
+
++#endif
++
+ /**
+ * @var OBJECTSEPARATOR
+ * Define the separator between object and subobject
+diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
+index cec76e9..5fb275a 100644
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -854,7 +854,8 @@ QStringList SKGDocument::getImpactedViews(const QString& iTable)
+ for (int i = 0; i < l.count(); ++i) { // Warning: the size of l will change in the loop
+ QString item = l.at(i);
+ if (m_ImpactedViews.contains(item)) {
+- for (const auto& name : qAsConst(m_ImpactedViews.value(item)))
++ QStringList impactedView = m_ImpactedViews.value(item);
++ for (const auto& name : qAsConst(impactedView))
+ if (!l.contains(name)) {
+ l.push_back(name);
+ }
+diff --git a/skgsqlcipher/qsql_sqlite.cpp b/skgsqlcipher/qsql_sqlite.cpp
+index 482cd35..ee1fcf6 100644
+--- a/skgsqlcipher/qsql_sqlite.cpp
++++ b/skgsqlcipher/qsql_sqlite.cpp
+@@ -130,7 +130,10 @@ protected:
+ void virtual_hook(int id, void* data) Q_DECL_OVERRIDE;
+
+ private:
+- QSQLiteResultPrivate* d;
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
++ QSQLiteResultPrivate* d_ptr;
++#endif
++ Q_DECLARE_PRIVATE(QSQLiteResult)
+ };
+
+ class QSQLiteDriverPrivate : public QSqlDriverPrivate
+@@ -145,17 +148,25 @@ public:
+ };
+
+
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++class QSQLiteResultPrivate : public QSqlCachedResultPrivate
++#else
+ class QSQLiteResultPrivate
++#endif
+ {
+ public:
+- QSQLiteResultPrivate(QSQLiteResult* res);
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv);
++#else
++ QSQLiteResultPrivate(QSQLiteResult *res);
++ QSQLiteResult* q_ptr;
++#endif
+ void cleanup();
+ bool fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch);
+ // initializes the recordInfo and the cache
+ void initColumns(bool emptyResultset);
+ void finalize();
+
+- QSQLiteResult* q;
+ sqlite3* access;
+
+ sqlite3_stmt* stmt;
+@@ -164,15 +175,27 @@ public:
+ bool skipRow; // skip the next fetchNext()?
+ QSqlRecord rInf;
+ QVector<QVariant> firstRow;
++
++ Q_DECLARE_PUBLIC(QSQLiteResult)
+ };
+
+-QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
+- stmt(0), skippedStatus(false), skipRow(false)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv)
++ : QSqlCachedResultPrivate(res, drv)
++#else
++QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res)
++ : q_ptr(res)
++#endif
++ , access(0)
++ , stmt(0)
++ , skippedStatus(false)
++ , skipRow(false)
+ {
+ }
+
+ void QSQLiteResultPrivate::cleanup()
+ {
++ Q_Q(QSQLiteResult);
+ finalize();
+ rInf.clear();
+ skippedStatus = false;
+@@ -194,6 +217,7 @@ void QSQLiteResultPrivate::finalize()
+
+ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
+ {
++ Q_Q(QSQLiteResult);
+ int nCols = sqlite3_column_count(stmt);
+ if (nCols <= 0) {
+ return;
+@@ -246,6 +270,8 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
+
+ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch)
+ {
++ Q_Q(QSQLiteResult);
++
+ int res;
+ int i;
+
+@@ -352,21 +378,29 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int i
+ }
+
+ QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ : QSqlCachedResult(*new QSQLiteResultPrivate(this, db))
++#else
+ : QSqlCachedResult(db)
++ , d_ptr(new QSQLiteResultPrivate(this))
++#endif
+ {
+- d = new QSQLiteResultPrivate(this);
++ Q_D(QSQLiteResult);
+ d->access = db->d_func()->access;
+ const_cast<QSQLiteDriverPrivate*>(db->d_func())->results.append(this);
+ }
+
+ QSQLiteResult::~QSQLiteResult()
+ {
++ Q_D(QSQLiteResult);
+ const QSqlDriver* sqlDriver = driver();
+ if (sqlDriver) {
+ const_cast<QSQLiteDriverPrivate*>(qobject_cast<const QSQLiteDriver*>(sqlDriver)->d_func())->results.removeOne(this);
+ }
+ d->cleanup();
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+ delete d;
++#endif
+ }
+
+ void QSQLiteResult::virtual_hook(int id, void* data)
+@@ -384,6 +418,7 @@ bool QSQLiteResult::reset(const QString& query)
+
+ bool QSQLiteResult::prepare(const QString& query)
+ {
++ Q_D(QSQLiteResult);
+ if (!driver() || !driver()->isOpen() || driver()->isOpenError()) {
+ return false;
+ }
+@@ -418,6 +453,7 @@ bool QSQLiteResult::prepare(const QString& query)
+
+ bool QSQLiteResult::exec()
+ {
++ Q_D(QSQLiteResult);
+ const QVector<QVariant> values = boundValues();
+
+ d->skippedStatus = false;
+@@ -515,7 +551,7 @@ bool QSQLiteResult::exec()
+
+ bool QSQLiteResult::gotoNext(QSqlCachedResult::ValueCache& row, int idx)
+ {
+- return d->fetchNext(row, idx, false);
++ return d_func()->fetchNext(row, idx, false);
+ }
+
+ int QSQLiteResult::size()
+@@ -525,13 +561,13 @@ int QSQLiteResult::size()
+
+ int QSQLiteResult::numRowsAffected()
+ {
+- return sqlite3_changes(d->access);
++ return sqlite3_changes(d_func()->access);
+ }
+
+ QVariant QSQLiteResult::lastInsertId() const
+ {
+ if (isActive()) {
+- qint64 id = sqlite3_last_insert_rowid(d->access);
++ qint64 id = sqlite3_last_insert_rowid(d_func()->access);
+ if (id) {
+ return id;
+ }
+@@ -544,19 +580,19 @@ QSqlRecord QSQLiteResult::record() const
+ if (!isActive() || !isSelect()) {
+ return QSqlRecord();
+ }
+- return d->rInf;
++ return d_func()->rInf;
+ }
+
+ void QSQLiteResult::detachFromResultSet()
+ {
+- if (d->stmt) {
+- sqlite3_reset(d->stmt);
++ if (d_func()->stmt) {
++ sqlite3_reset(d_func()->stmt);
+ }
+ }
+
+ QVariant QSQLiteResult::handle() const
+ {
+- return QVariant::fromValue(d->stmt);
++ return QVariant::fromValue(d_func()->stmt);
+ }
+
+ /////////////////////////////////////////////////////////
+@@ -668,7 +704,7 @@ void QSQLiteDriver::close()
+ Q_D(QSQLiteDriver);
+ if (isOpen()) {
+ foreach (QSQLiteResult* result, d->results) {
+- result->d->finalize();
++ result->d_func()->finalize();
+ }
+
+ if (sqlite3_close(d->access) != SQLITE_OK)
Deleted: community-i686/skrooge.changelog
===================================================================
--- community-i686/skrooge.changelog 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-i686/skrooge.changelog 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,74 +0,0 @@
-2016-07-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.4.0-3 FS#49880 fix
-
-2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.4.0-1
-
-2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.3.0-3 pacman hooks rebuild
-
-2016-02-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.3.0-1
-
-2015-11-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.2.0-1
-
-2015-09-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.1.1-1
-
-2015-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.1.0-1
-
-2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.0.0-1 - kf5 version
-
-2015-06-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.12.5-1
-
-2015-05-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.12.0-1
-
-2015-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.11.0-1
-
-2014-10-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.10.0-1
-
-2014-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.9.0-1
-
-2013-12-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.8.0-3 FS#37406 fix
-
-2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.8.0-1
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.7.1-1
-
-2013-03-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.6.0-1
-
-2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.5.1-1
-
-2013-01-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.4.0-1
-
-2012-09-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.3-1
-
-2012-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.2-1
-
-2012-08-09 Eric Belanger <eric at archlinux.org>
- * skrooge 1.3.0-2 Rebuild against libofx 0.9.5
-
-2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.0-1
-
-2012-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.2.0-1
-
-2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.1.1-1
Copied: skrooge/repos/community-i686/skrooge.changelog (from rev 191232, skrooge/trunk/skrooge.changelog)
===================================================================
--- community-i686/skrooge.changelog (rev 0)
+++ community-i686/skrooge.changelog 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,77 @@
+2016-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.5.0-1
+
+2016-07-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.4.0-3 FS#49880 fix
+
+2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.4.0-1
+
+2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.3.0-3 pacman hooks rebuild
+
+2016-02-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.3.0-1
+
+2015-11-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.2.0-1
+
+2015-09-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.1.1-1
+
+2015-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.1.0-1
+
+2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.0.0-1 - kf5 version
+
+2015-06-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.12.5-1
+
+2015-05-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.12.0-1
+
+2015-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.11.0-1
+
+2014-10-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.10.0-1
+
+2014-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.9.0-1
+
+2013-12-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.8.0-3 FS#37406 fix
+
+2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.8.0-1
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.7.1-1
+
+2013-03-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.6.0-1
+
+2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.5.1-1
+
+2013-01-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.4.0-1
+
+2012-09-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.3-1
+
+2012-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.2-1
+
+2012-08-09 Eric Belanger <eric at archlinux.org>
+ * skrooge 1.3.0-2 Rebuild against libofx 0.9.5
+
+2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.0-1
+
+2012-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.2.0-1
+
+2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.1.1-1
Deleted: community-i686/skrooge.install
===================================================================
--- community-i686/skrooge.install 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-i686/skrooge.install 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,11 +0,0 @@
-post_install() {
- kbuildsycoca5 &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: skrooge/repos/community-i686/skrooge.install (from rev 191232, skrooge/trunk/skrooge.install)
===================================================================
--- community-i686/skrooge.install (rev 0)
+++ community-i686/skrooge.install 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,11 @@
+post_install() {
+ kbuildsycoca5 &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-x86_64/PKGBUILD 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: neuromante <lorenzo.nizzi.grifi at gmail.com>
-
-pkgname=skrooge
-pkgver=2.4.0
-pkgrel=3
-pkgdesc="A personal finances manager for KDE"
-arch=('i686' 'x86_64')
-url="http://skrooge.org/"
-license=('GPL')
-depends=('qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'qt5-webkit' 'libofx' 'grantlee-qt5'
- 'kross' 'knewstuff' 'krunner' 'knotifyconfig' 'kdelibs4support' 'sqlcipher')
-makedepends=('cmake' 'kdoctools' 'extra-cmake-modules' 'python' 'kdesignerplugin' 'patch')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
- skrooge-qt57.patch)
-sha256sums=('132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe'
- '3d86a4f4933fffceb5bb7dc5b2ecd1cc69713c5fe87eb4097b2d2c4bfa3ef3f2')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
- patch -Np1 -i "${srcdir}"/$pkgname-qt57.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- export
- cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` \
- -DKDE_INSTALL_QTPLUGINDIR=`kf5-config --qt-plugins` \
- -DKDE_INSTALL_LIBDIR=/usr/lib
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: skrooge/repos/community-x86_64/PKGBUILD (from rev 191232, skrooge/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: neuromante <lorenzo.nizzi.grifi at gmail.com>
+
+pkgname=skrooge
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="A personal finances manager for KDE"
+arch=('i686' 'x86_64')
+url="http://skrooge.org/"
+license=('GPL')
+depends=('qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'qt5-webkit' 'libofx' 'grantlee'
+ 'kross' 'knewstuff' 'krunner' 'knotifyconfig' 'kdelibs4support' 'sqlcipher')
+makedepends=('cmake' 'kdoctools' 'extra-cmake-modules' 'python' 'kdesignerplugin' 'patch')
+options=('!emptydirs')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
+ skrooge-qt57.patch)
+sha256sums=('97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d'
+ '3d86a4f4933fffceb5bb7dc5b2ecd1cc69713c5fe87eb4097b2d2c4bfa3ef3f2')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+# patch -Np1 -i "${srcdir}"/$pkgname-qt57.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ export
+ cmake . -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` \
+ -DKDE_INSTALL_QTPLUGINDIR=`kf5-config --qt-plugins` \
+ -DKDE_INSTALL_LIBDIR=/usr/lib
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/skrooge-qt57.patch
===================================================================
--- community-x86_64/skrooge-qt57.patch 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-x86_64/skrooge-qt57.patch 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,231 +0,0 @@
-diff --git a/skgbasemodeler/skgdefine.h b/skgbasemodeler/skgdefine.h
-index 5c0a207..7a216ae 100644
---- a/skgbasemodeler/skgdefine.h
-+++ b/skgbasemodeler/skgdefine.h
-@@ -28,6 +28,7 @@
-
- #include "skgbasemodeler_export.h"
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-
- template <typename T> struct QAddConst {
- typedef const T Type;
-@@ -37,6 +38,8 @@ template <typename T> struct QAddConst {
- template <typename T>
- Q_DECL_CONSTEXPR typename QAddConst<T>::Type& qAsConst(T& t) Q_DECL_NOTHROW { return t; }
-
-+#endif
-+
- /**
- * @var OBJECTSEPARATOR
- * Define the separator between object and subobject
-diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
-index cec76e9..5fb275a 100644
---- a/skgbasemodeler/skgdocument.cpp
-+++ b/skgbasemodeler/skgdocument.cpp
-@@ -854,7 +854,8 @@ QStringList SKGDocument::getImpactedViews(const QString& iTable)
- for (int i = 0; i < l.count(); ++i) { // Warning: the size of l will change in the loop
- QString item = l.at(i);
- if (m_ImpactedViews.contains(item)) {
-- for (const auto& name : qAsConst(m_ImpactedViews.value(item)))
-+ QStringList impactedView = m_ImpactedViews.value(item);
-+ for (const auto& name : qAsConst(impactedView))
- if (!l.contains(name)) {
- l.push_back(name);
- }
-diff --git a/skgsqlcipher/qsql_sqlite.cpp b/skgsqlcipher/qsql_sqlite.cpp
-index 482cd35..ee1fcf6 100644
---- a/skgsqlcipher/qsql_sqlite.cpp
-+++ b/skgsqlcipher/qsql_sqlite.cpp
-@@ -130,7 +130,10 @@ protected:
- void virtual_hook(int id, void* data) Q_DECL_OVERRIDE;
-
- private:
-- QSQLiteResultPrivate* d;
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-+ QSQLiteResultPrivate* d_ptr;
-+#endif
-+ Q_DECLARE_PRIVATE(QSQLiteResult)
- };
-
- class QSQLiteDriverPrivate : public QSqlDriverPrivate
-@@ -145,17 +148,25 @@ public:
- };
-
-
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+class QSQLiteResultPrivate : public QSqlCachedResultPrivate
-+#else
- class QSQLiteResultPrivate
-+#endif
- {
- public:
-- QSQLiteResultPrivate(QSQLiteResult* res);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv);
-+#else
-+ QSQLiteResultPrivate(QSQLiteResult *res);
-+ QSQLiteResult* q_ptr;
-+#endif
- void cleanup();
- bool fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch);
- // initializes the recordInfo and the cache
- void initColumns(bool emptyResultset);
- void finalize();
-
-- QSQLiteResult* q;
- sqlite3* access;
-
- sqlite3_stmt* stmt;
-@@ -164,15 +175,27 @@ public:
- bool skipRow; // skip the next fetchNext()?
- QSqlRecord rInf;
- QVector<QVariant> firstRow;
-+
-+ Q_DECLARE_PUBLIC(QSQLiteResult)
- };
-
--QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
-- stmt(0), skippedStatus(false), skipRow(false)
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv)
-+ : QSqlCachedResultPrivate(res, drv)
-+#else
-+QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res)
-+ : q_ptr(res)
-+#endif
-+ , access(0)
-+ , stmt(0)
-+ , skippedStatus(false)
-+ , skipRow(false)
- {
- }
-
- void QSQLiteResultPrivate::cleanup()
- {
-+ Q_Q(QSQLiteResult);
- finalize();
- rInf.clear();
- skippedStatus = false;
-@@ -194,6 +217,7 @@ void QSQLiteResultPrivate::finalize()
-
- void QSQLiteResultPrivate::initColumns(bool emptyResultset)
- {
-+ Q_Q(QSQLiteResult);
- int nCols = sqlite3_column_count(stmt);
- if (nCols <= 0) {
- return;
-@@ -246,6 +270,8 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
-
- bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch)
- {
-+ Q_Q(QSQLiteResult);
-+
- int res;
- int i;
-
-@@ -352,21 +378,29 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int i
- }
-
- QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db)
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ : QSqlCachedResult(*new QSQLiteResultPrivate(this, db))
-+#else
- : QSqlCachedResult(db)
-+ , d_ptr(new QSQLiteResultPrivate(this))
-+#endif
- {
-- d = new QSQLiteResultPrivate(this);
-+ Q_D(QSQLiteResult);
- d->access = db->d_func()->access;
- const_cast<QSQLiteDriverPrivate*>(db->d_func())->results.append(this);
- }
-
- QSQLiteResult::~QSQLiteResult()
- {
-+ Q_D(QSQLiteResult);
- const QSqlDriver* sqlDriver = driver();
- if (sqlDriver) {
- const_cast<QSQLiteDriverPrivate*>(qobject_cast<const QSQLiteDriver*>(sqlDriver)->d_func())->results.removeOne(this);
- }
- d->cleanup();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
- delete d;
-+#endif
- }
-
- void QSQLiteResult::virtual_hook(int id, void* data)
-@@ -384,6 +418,7 @@ bool QSQLiteResult::reset(const QString& query)
-
- bool QSQLiteResult::prepare(const QString& query)
- {
-+ Q_D(QSQLiteResult);
- if (!driver() || !driver()->isOpen() || driver()->isOpenError()) {
- return false;
- }
-@@ -418,6 +453,7 @@ bool QSQLiteResult::prepare(const QString& query)
-
- bool QSQLiteResult::exec()
- {
-+ Q_D(QSQLiteResult);
- const QVector<QVariant> values = boundValues();
-
- d->skippedStatus = false;
-@@ -515,7 +551,7 @@ bool QSQLiteResult::exec()
-
- bool QSQLiteResult::gotoNext(QSqlCachedResult::ValueCache& row, int idx)
- {
-- return d->fetchNext(row, idx, false);
-+ return d_func()->fetchNext(row, idx, false);
- }
-
- int QSQLiteResult::size()
-@@ -525,13 +561,13 @@ int QSQLiteResult::size()
-
- int QSQLiteResult::numRowsAffected()
- {
-- return sqlite3_changes(d->access);
-+ return sqlite3_changes(d_func()->access);
- }
-
- QVariant QSQLiteResult::lastInsertId() const
- {
- if (isActive()) {
-- qint64 id = sqlite3_last_insert_rowid(d->access);
-+ qint64 id = sqlite3_last_insert_rowid(d_func()->access);
- if (id) {
- return id;
- }
-@@ -544,19 +580,19 @@ QSqlRecord QSQLiteResult::record() const
- if (!isActive() || !isSelect()) {
- return QSqlRecord();
- }
-- return d->rInf;
-+ return d_func()->rInf;
- }
-
- void QSQLiteResult::detachFromResultSet()
- {
-- if (d->stmt) {
-- sqlite3_reset(d->stmt);
-+ if (d_func()->stmt) {
-+ sqlite3_reset(d_func()->stmt);
- }
- }
-
- QVariant QSQLiteResult::handle() const
- {
-- return QVariant::fromValue(d->stmt);
-+ return QVariant::fromValue(d_func()->stmt);
- }
-
- /////////////////////////////////////////////////////////
-@@ -668,7 +704,7 @@ void QSQLiteDriver::close()
- Q_D(QSQLiteDriver);
- if (isOpen()) {
- foreach (QSQLiteResult* result, d->results) {
-- result->d->finalize();
-+ result->d_func()->finalize();
- }
-
- if (sqlite3_close(d->access) != SQLITE_OK)
Copied: skrooge/repos/community-x86_64/skrooge-qt57.patch (from rev 191232, skrooge/trunk/skrooge-qt57.patch)
===================================================================
--- community-x86_64/skrooge-qt57.patch (rev 0)
+++ community-x86_64/skrooge-qt57.patch 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,231 @@
+diff --git a/skgbasemodeler/skgdefine.h b/skgbasemodeler/skgdefine.h
+index 5c0a207..7a216ae 100644
+--- a/skgbasemodeler/skgdefine.h
++++ b/skgbasemodeler/skgdefine.h
+@@ -28,6 +28,7 @@
+
+ #include "skgbasemodeler_export.h"
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+
+ template <typename T> struct QAddConst {
+ typedef const T Type;
+@@ -37,6 +38,8 @@ template <typename T> struct QAddConst {
+ template <typename T>
+ Q_DECL_CONSTEXPR typename QAddConst<T>::Type& qAsConst(T& t) Q_DECL_NOTHROW { return t; }
+
++#endif
++
+ /**
+ * @var OBJECTSEPARATOR
+ * Define the separator between object and subobject
+diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
+index cec76e9..5fb275a 100644
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -854,7 +854,8 @@ QStringList SKGDocument::getImpactedViews(const QString& iTable)
+ for (int i = 0; i < l.count(); ++i) { // Warning: the size of l will change in the loop
+ QString item = l.at(i);
+ if (m_ImpactedViews.contains(item)) {
+- for (const auto& name : qAsConst(m_ImpactedViews.value(item)))
++ QStringList impactedView = m_ImpactedViews.value(item);
++ for (const auto& name : qAsConst(impactedView))
+ if (!l.contains(name)) {
+ l.push_back(name);
+ }
+diff --git a/skgsqlcipher/qsql_sqlite.cpp b/skgsqlcipher/qsql_sqlite.cpp
+index 482cd35..ee1fcf6 100644
+--- a/skgsqlcipher/qsql_sqlite.cpp
++++ b/skgsqlcipher/qsql_sqlite.cpp
+@@ -130,7 +130,10 @@ protected:
+ void virtual_hook(int id, void* data) Q_DECL_OVERRIDE;
+
+ private:
+- QSQLiteResultPrivate* d;
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
++ QSQLiteResultPrivate* d_ptr;
++#endif
++ Q_DECLARE_PRIVATE(QSQLiteResult)
+ };
+
+ class QSQLiteDriverPrivate : public QSqlDriverPrivate
+@@ -145,17 +148,25 @@ public:
+ };
+
+
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++class QSQLiteResultPrivate : public QSqlCachedResultPrivate
++#else
+ class QSQLiteResultPrivate
++#endif
+ {
+ public:
+- QSQLiteResultPrivate(QSQLiteResult* res);
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv);
++#else
++ QSQLiteResultPrivate(QSQLiteResult *res);
++ QSQLiteResult* q_ptr;
++#endif
+ void cleanup();
+ bool fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch);
+ // initializes the recordInfo and the cache
+ void initColumns(bool emptyResultset);
+ void finalize();
+
+- QSQLiteResult* q;
+ sqlite3* access;
+
+ sqlite3_stmt* stmt;
+@@ -164,15 +175,27 @@ public:
+ bool skipRow; // skip the next fetchNext()?
+ QSqlRecord rInf;
+ QVector<QVariant> firstRow;
++
++ Q_DECLARE_PUBLIC(QSQLiteResult)
+ };
+
+-QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
+- stmt(0), skippedStatus(false), skipRow(false)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv)
++ : QSqlCachedResultPrivate(res, drv)
++#else
++QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res)
++ : q_ptr(res)
++#endif
++ , access(0)
++ , stmt(0)
++ , skippedStatus(false)
++ , skipRow(false)
+ {
+ }
+
+ void QSQLiteResultPrivate::cleanup()
+ {
++ Q_Q(QSQLiteResult);
+ finalize();
+ rInf.clear();
+ skippedStatus = false;
+@@ -194,6 +217,7 @@ void QSQLiteResultPrivate::finalize()
+
+ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
+ {
++ Q_Q(QSQLiteResult);
+ int nCols = sqlite3_column_count(stmt);
+ if (nCols <= 0) {
+ return;
+@@ -246,6 +270,8 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
+
+ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int idx, bool initialFetch)
+ {
++ Q_Q(QSQLiteResult);
++
+ int res;
+ int i;
+
+@@ -352,21 +378,29 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache& values, int i
+ }
+
+ QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ : QSqlCachedResult(*new QSQLiteResultPrivate(this, db))
++#else
+ : QSqlCachedResult(db)
++ , d_ptr(new QSQLiteResultPrivate(this))
++#endif
+ {
+- d = new QSQLiteResultPrivate(this);
++ Q_D(QSQLiteResult);
+ d->access = db->d_func()->access;
+ const_cast<QSQLiteDriverPrivate*>(db->d_func())->results.append(this);
+ }
+
+ QSQLiteResult::~QSQLiteResult()
+ {
++ Q_D(QSQLiteResult);
+ const QSqlDriver* sqlDriver = driver();
+ if (sqlDriver) {
+ const_cast<QSQLiteDriverPrivate*>(qobject_cast<const QSQLiteDriver*>(sqlDriver)->d_func())->results.removeOne(this);
+ }
+ d->cleanup();
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+ delete d;
++#endif
+ }
+
+ void QSQLiteResult::virtual_hook(int id, void* data)
+@@ -384,6 +418,7 @@ bool QSQLiteResult::reset(const QString& query)
+
+ bool QSQLiteResult::prepare(const QString& query)
+ {
++ Q_D(QSQLiteResult);
+ if (!driver() || !driver()->isOpen() || driver()->isOpenError()) {
+ return false;
+ }
+@@ -418,6 +453,7 @@ bool QSQLiteResult::prepare(const QString& query)
+
+ bool QSQLiteResult::exec()
+ {
++ Q_D(QSQLiteResult);
+ const QVector<QVariant> values = boundValues();
+
+ d->skippedStatus = false;
+@@ -515,7 +551,7 @@ bool QSQLiteResult::exec()
+
+ bool QSQLiteResult::gotoNext(QSqlCachedResult::ValueCache& row, int idx)
+ {
+- return d->fetchNext(row, idx, false);
++ return d_func()->fetchNext(row, idx, false);
+ }
+
+ int QSQLiteResult::size()
+@@ -525,13 +561,13 @@ int QSQLiteResult::size()
+
+ int QSQLiteResult::numRowsAffected()
+ {
+- return sqlite3_changes(d->access);
++ return sqlite3_changes(d_func()->access);
+ }
+
+ QVariant QSQLiteResult::lastInsertId() const
+ {
+ if (isActive()) {
+- qint64 id = sqlite3_last_insert_rowid(d->access);
++ qint64 id = sqlite3_last_insert_rowid(d_func()->access);
+ if (id) {
+ return id;
+ }
+@@ -544,19 +580,19 @@ QSqlRecord QSQLiteResult::record() const
+ if (!isActive() || !isSelect()) {
+ return QSqlRecord();
+ }
+- return d->rInf;
++ return d_func()->rInf;
+ }
+
+ void QSQLiteResult::detachFromResultSet()
+ {
+- if (d->stmt) {
+- sqlite3_reset(d->stmt);
++ if (d_func()->stmt) {
++ sqlite3_reset(d_func()->stmt);
+ }
+ }
+
+ QVariant QSQLiteResult::handle() const
+ {
+- return QVariant::fromValue(d->stmt);
++ return QVariant::fromValue(d_func()->stmt);
+ }
+
+ /////////////////////////////////////////////////////////
+@@ -668,7 +704,7 @@ void QSQLiteDriver::close()
+ Q_D(QSQLiteDriver);
+ if (isOpen()) {
+ foreach (QSQLiteResult* result, d->results) {
+- result->d->finalize();
++ result->d_func()->finalize();
+ }
+
+ if (sqlite3_close(d->access) != SQLITE_OK)
Deleted: community-x86_64/skrooge.changelog
===================================================================
--- community-x86_64/skrooge.changelog 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-x86_64/skrooge.changelog 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,74 +0,0 @@
-2016-07-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.4.0-3 FS#49880 fix
-
-2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.4.0-1
-
-2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.3.0-3 pacman hooks rebuild
-
-2016-02-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.3.0-1
-
-2015-11-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.2.0-1
-
-2015-09-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.1.1-1
-
-2015-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.1.0-1
-
-2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 2.0.0-1 - kf5 version
-
-2015-06-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.12.5-1
-
-2015-05-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.12.0-1
-
-2015-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.11.0-1
-
-2014-10-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.10.0-1
-
-2014-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.9.0-1
-
-2013-12-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.8.0-3 FS#37406 fix
-
-2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.8.0-1
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.7.1-1
-
-2013-03-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.6.0-1
-
-2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.5.1-1
-
-2013-01-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.4.0-1
-
-2012-09-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.3-1
-
-2012-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.2-1
-
-2012-08-09 Eric Belanger <eric at archlinux.org>
- * skrooge 1.3.0-2 Rebuild against libofx 0.9.5
-
-2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.3.0-1
-
-2012-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.2.0-1
-
-2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * skrooge 1.1.1-1
Copied: skrooge/repos/community-x86_64/skrooge.changelog (from rev 191232, skrooge/trunk/skrooge.changelog)
===================================================================
--- community-x86_64/skrooge.changelog (rev 0)
+++ community-x86_64/skrooge.changelog 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,77 @@
+2016-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.5.0-1
+
+2016-07-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.4.0-3 FS#49880 fix
+
+2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.4.0-1
+
+2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.3.0-3 pacman hooks rebuild
+
+2016-02-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.3.0-1
+
+2015-11-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.2.0-1
+
+2015-09-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.1.1-1
+
+2015-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.1.0-1
+
+2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 2.0.0-1 - kf5 version
+
+2015-06-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.12.5-1
+
+2015-05-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.12.0-1
+
+2015-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.11.0-1
+
+2014-10-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.10.0-1
+
+2014-04-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.9.0-1
+
+2013-12-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.8.0-3 FS#37406 fix
+
+2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.8.0-1
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.7.1-1
+
+2013-03-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.6.0-1
+
+2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.5.1-1
+
+2013-01-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.4.0-1
+
+2012-09-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.3-1
+
+2012-08-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.2-1
+
+2012-08-09 Eric Belanger <eric at archlinux.org>
+ * skrooge 1.3.0-2 Rebuild against libofx 0.9.5
+
+2012-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.3.0-1
+
+2012-02-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.2.0-1
+
+2011-11-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * skrooge 1.1.1-1
Deleted: community-x86_64/skrooge.install
===================================================================
--- community-x86_64/skrooge.install 2016-10-02 20:37:40 UTC (rev 191232)
+++ community-x86_64/skrooge.install 2016-10-02 20:37:54 UTC (rev 191233)
@@ -1,11 +0,0 @@
-post_install() {
- kbuildsycoca5 &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: skrooge/repos/community-x86_64/skrooge.install (from rev 191232, skrooge/trunk/skrooge.install)
===================================================================
--- community-x86_64/skrooge.install (rev 0)
+++ community-x86_64/skrooge.install 2016-10-02 20:37:54 UTC (rev 191233)
@@ -0,0 +1,11 @@
+post_install() {
+ kbuildsycoca5 &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list