[packages/mysql-workbench] - updated BRs and added fixes for archs other than x86_64

[baggins]

commit 3431ba351e5f2eabfaafb63bcc2b1e8e857390e4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 18 17:02:03 2023 +0200

    - updated BRs and added fixes for archs other than x86_64

 format-string.patch  | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mysql-workbench.spec |  3 ++
 2 files changed, 86 insertions(+)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 19c5b9e..2f5c53f 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -29,6 +29,7 @@ Patch4:		mysql-version.patch
 Patch5:		ldconfig.patch
 Patch6:		types.patch
 Patch7:		stdint.patch
+Patch8:		format-string.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	antlr4-cpp-runtime-devel
@@ -42,6 +43,7 @@ BuildRequires:	ctemplate-devel >= 2.3
 BuildRequires:	gdal-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtkmm3-devel
+%buildrequires_jdk
 BuildRequires:	libgnome-keyring-devel
 %{?with_gnome_keyring:BuildRequires:	libgnome-keyring-devel}
 BuildRequires:	libsecret-devel
@@ -110,6 +112,7 @@ skomplikowanych migracji do MySQL-a.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp -p '%{SOURCE2}' res/mysql.profiles
 
 install -d linux-res/bin
diff --git a/format-string.patch b/format-string.patch
new file mode 100644
index 0000000..4adb858
--- /dev/null
+++ b/format-string.patch
@@ -0,0 +1,83 @@
+--- mysql-workbench-community-8.0.34-src/library/ssh/SSHCommon.cpp.orig	2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/library/ssh/SSHCommon.cpp	2023-09-18 16:53:07.116123139 +0200
+@@ -168,11 +168,16 @@
+ 
+   void SSHConnectionConfig::dumpConfig() const {
+     logDebug2("SSH Connection config info:\n");
+-    logDebug2("SSH bufferSize: %lu\n", bufferSize);
+-    logDebug2("SSH connectTimeout: %lu\n", connectTimeout);
+-    logDebug2("SSH readWriteTimeout: %lu\n", readWriteTimeout);
+-    logDebug2("SSH commandTimeout: %lu\n", commandTimeout);
+-    logDebug2("SSH commandRetryCount: %lu\n", commandRetryCount);
++#ifdef __LP64__
++#define __FORMAT "%lu"
++#else
++#define __FORMAT "%u"
++#endif
++    logDebug2("SSH bufferSize: " __FORMAT "\n", bufferSize);
++    logDebug2("SSH connectTimeout: " __FORMAT "\n", connectTimeout);
++    logDebug2("SSH readWriteTimeout: " __FORMAT "\n", readWriteTimeout);
++    logDebug2("SSH commandTimeout: " __FORMAT "\n", commandTimeout);
++    logDebug2("SSH commandRetryCount: " __FORMAT "\n", commandRetryCount);
+     logDebug2("SSH optionsDir: %s\n", optionsDir.c_str());
+     logDebug2("SSH known hosts file: %s\n", knownHostsFile.c_str());
+     logDebug2("SSH local host: %s\n", localhost.c_str());
+@@ -180,7 +185,7 @@
+     logDebug2("SSH remote host: %s\n", remotehost.c_str());
+     logDebug2("SSH remote port: %d\n", remoteport);
+     logDebug2("SSH remote ssh host: %s\n", remoteSSHhost.c_str());
+-    logDebug2("SSH remote ssh port: %lu\n", remoteSSHport);
++    logDebug2("SSH remote ssh port: " __FORMAT "\n", remoteSSHport);
+     logDebug2("SSH strict host key check: %s\n", strictHostKeyCheck ? "yes" : "no");
+   }
+ 
+--- mysql-workbench-community-8.0.34-src/library/ssh/SSHSession.cpp.orig	2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/library/ssh/SSHSession.cpp	2023-09-18 16:55:47.953474994 +0200
+@@ -147,7 +147,12 @@
+     try {
+       _session->connect();
+     } catch (ssh::SshException &exc) {
+-      logError("Unable to connect: %s:%lu\nError was: %s\n", config.remoteSSHhost.c_str(), config.remoteSSHport,
++#ifdef __LP64__
++#define __FORMAT "%lu"
++#else
++#define __FORMAT "%u"
++#endif
++      logError("Unable to connect: %s:" __FORMAT "\nError was: %s\n", config.remoteSSHhost.c_str(), config.remoteSSHport,
+                exc.getError().c_str());
+       return std::make_tuple(SSHReturnType::CONNECTION_FAILURE, exc.getError());
+     }
+@@ -360,7 +365,7 @@
+       }
+     } while (true);
+ 
+-    logDebug3("Bytes read: %lu\n", bytesRead);
++    logDebug3("Bytes read: " __FORMAT "\n", bytesRead);
+     return std::make_tuple(so.str(), retError, channel->getExitStatus());
+   }
+ 
+@@ -479,7 +484,7 @@
+       }
+     } while (true);
+ 
+-    logDebug3("Bytes read: %lu\n", bytesRead);
++    logDebug3("Bytes read: " __FORMAT "\n", bytesRead);
+     return std::make_tuple(so.str(), retError, channel->getExitStatus());
+   }
+ 
+--- mysql-workbench-community-8.0.34-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp~	2023-07-13 14:52:08.000000000 +0200
++++ mysql-workbench-community-8.0.34-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2023-09-18 16:58:57.878187173 +0200
+@@ -2016,7 +2016,12 @@
+ 
+     bool results_left = false;
+     for (auto &statement_range : statement_ranges) {
+-      logDebug3("Executing statement range: %lu, %lu...\n", statement_range.first, statement_range.second);
++#ifdef __LP64__
++#define __FORMAT "%lu"
++#else
++#define __FORMAT "%u"
++#endif
++      logDebug3("Executing statement range: " __FORMAT ", " __FORMAT "...\n", statement_range.first, statement_range.second);
+ 
+       statement = sql->substr(statement_range.first, statement_range.second);
+       std::list<std::string> sub_statements;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/3431ba351e5f2eabfaafb63bcc2b1e8e857390e4