[arch-commits] Commit in digikam/trunk (49ee18fb.patch PKGBUILD)

[Antonio Rojas]

    Date: Monday, July 26, 2021 @ 09:36:46
  Author: arojas
Revision: 420403

Add one more patch for mysql DB upgrade

Modified:
  digikam/trunk/49ee18fb.patch
  digikam/trunk/PKGBUILD

----------------+
 49ee18fb.patch |   25 +++++++++++++++++++++++--
 PKGBUILD       |    4 ++--
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: 49ee18fb.patch
===================================================================
--- 49ee18fb.patch	2021-07-26 06:37:54 UTC (rev 420402)
+++ 49ee18fb.patch	2021-07-26 09:36:46 UTC (rev 420403)
@@ -188,6 +188,27 @@
      /**
       * Return the current user account name.
       */
--- 
-GitLab
+diff --git a/core/libs/database/server/databaseserver.cpp b/core/libs/database/server/databaseserver.cpp
+index cebe9d0f6a..37765e3231 100644
+--- a/core/libs/database/server/databaseserver.cpp
++++ b/core/libs/database/server/databaseserver.cpp
+@@ -689,7 +689,6 @@ DatabaseServerError DatabaseServer::initMysqlDatabase() const
+             {
+                 if (query.next() && (query.lastError().type() == QSqlError::NoError))
+                 {
+-
+                     QRegExp reg(QLatin1String("\\d+\\.\\d+\\.\\d+"));
+ 
+                     if (reg.indexIn(query.value(0).toString()) != -1)
+@@ -747,7 +746,9 @@ DatabaseServerError DatabaseServer::checkUpgradeMysqlDatabase()
+ 
+     delete versionProcess;
+ 
+-    if (serverVersion == d->dbVersion)
++    if (d->dbVersion.isEmpty()        ||
++        serverVersion.isEmpty()       ||
++        (serverVersion == d->dbVersion))
+     {
+         return result;
+     }
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-26 06:37:54 UTC (rev 420402)
+++ PKGBUILD	2021-07-26 09:36:46 UTC (rev 420403)
@@ -7,7 +7,7 @@
 pkgname=digikam
 _pkgver=7.3.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=3
+pkgrel=4
 pkgdesc='An advanced digital photo management application'
 arch=(x86_64)
 license=(GPL)
@@ -22,7 +22,7 @@
         49ee18fb.patch)
 sha256sums=('95aea93be1cfd39bb52333b82b3e57bf68080c7d1319d754d167a20f6dbe4551'
             'SKIP'
-            'e1980cd4ee76160e1262ec1044d5072a1c8ea1e36a020882e53f5cb7edd0ce23')
+            'eeba37084e799ebf5aac5d3ee002ef9a286067c0461cb609612366c0841d55cf')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
 
 prepare() {