[arch-commits] Commit in mysql-workbench/repos/community-x86_64 (12 files)
Christian Hesse
eworm at archlinux.org
Fri Aug 10 14:51:37 UTC 2018
Date: Friday, August 10, 2018 @ 14:51:36
Author: eworm
Revision: 370914
archrelease: copy trunk to community-x86_64
Added:
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 370913, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch
(from rev 370913, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-x86_64/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
(from rev 370913, mysql-workbench/trunk/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch)
mysql-workbench/repos/community-x86_64/0004-libssh-fix-read-config.patch
(from rev 370913, mysql-workbench/trunk/0004-libssh-fix-read-config.patch)
mysql-workbench/repos/community-x86_64/PKGBUILD
(from rev 370913, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
(from rev 370913, mysql-workbench/trunk/arch_linux_profile.xml)
Deleted:
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch
mysql-workbench/repos/community-x86_64/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
mysql-workbench/repos/community-x86_64/0004-libssh-fix-read-config.patch
mysql-workbench/repos/community-x86_64/PKGBUILD
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
----------------------------------------------------------------+
0001-mysql-workbench-no-check-for-updates.patch | 60 -
0002-disable-unsupported-operating-system-warning.patch | 52 -
0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch | 292 +++----
0004-libssh-fix-read-config.patch | 58 -
PKGBUILD | 396 +++++-----
5 files changed, 429 insertions(+), 429 deletions(-)
Deleted: 0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- 0001-mysql-workbench-no-check-for-updates.patch 2018-08-10 14:51:28 UTC (rev 370913)
+++ 0001-mysql-workbench-no-check-for-updates.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -1,30 +0,0 @@
-From d15e588be02e44b1317bf90ff7be1714267281c8 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Mon, 23 Jul 2018 11:03:19 +0200
-Subject: [PATCH 1/4] mysql-workbench-no-check-for-updates
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- res/wbdata/main_menu.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index bfa63ef..957f809 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2277,6 +2277,7 @@
- <value type="string" key="command">builtin:show_log_file</value>
- <value type="string" key="itemType">action</value>
- </value>
-+ <!-- We build a package that should be updated via pacman, so disable this check.
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2287,6 +2288,7 @@
- <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
- </value>
-+ </value> //-->
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
- <value type="string" key="platform">windows,linux</value>
Copied: mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 370913, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- 0001-mysql-workbench-no-check-for-updates.patch (rev 0)
+++ 0001-mysql-workbench-no-check-for-updates.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -0,0 +1,30 @@
+From d15e588be02e44b1317bf90ff7be1714267281c8 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Mon, 23 Jul 2018 11:03:19 +0200
+Subject: [PATCH 1/4] mysql-workbench-no-check-for-updates
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ res/wbdata/main_menu.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index bfa63ef..957f809 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2277,6 +2277,7 @@
+ <value type="string" key="command">builtin:show_log_file</value>
+ <value type="string" key="itemType">action</value>
+ </value>
++ <!-- We build a package that should be updated via pacman, so disable this check.
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2287,6 +2288,7 @@
+ <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+ </value>
++ </value> //-->
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
+ <value type="string" key="platform">windows,linux</value>
Deleted: 0002-disable-unsupported-operating-system-warning.patch
===================================================================
--- 0002-disable-unsupported-operating-system-warning.patch 2018-08-10 14:51:28 UTC (rev 370913)
+++ 0002-disable-unsupported-operating-system-warning.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -1,26 +0,0 @@
-From 98a9974f550dfb5c8f66213774e4ef95848127e1 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Mon, 23 Jul 2018 11:04:55 +0200
-Subject: [PATCH 2/4] disable-unsupported-operating-system-warning
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- backend/wbprivate/workbench/wb_context.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp
-index e80501a..a4047b1 100644
---- a/backend/wbprivate/workbench/wb_context.cpp
-+++ b/backend/wbprivate/workbench/wb_context.cpp
-@@ -1011,9 +1011,11 @@ void WBContext::init_finish_(WBOptions *options) {
-
- _frontendCallbacks->show_status_text(_("Ready."));
-
-+#if 0
- // Avoid our runtime tests to lock up when a modal warning dialog is displayed.
- if (options->open_at_startup_type != "run-script")
- warnIfRunningOnUnsupportedOS();
-+#endif
-
- try {
- // execute action requested from command line
Copied: mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch (from rev 370913, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
===================================================================
--- 0002-disable-unsupported-operating-system-warning.patch (rev 0)
+++ 0002-disable-unsupported-operating-system-warning.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -0,0 +1,26 @@
+From 98a9974f550dfb5c8f66213774e4ef95848127e1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Mon, 23 Jul 2018 11:04:55 +0200
+Subject: [PATCH 2/4] disable-unsupported-operating-system-warning
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ backend/wbprivate/workbench/wb_context.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp
+index e80501a..a4047b1 100644
+--- a/backend/wbprivate/workbench/wb_context.cpp
++++ b/backend/wbprivate/workbench/wb_context.cpp
+@@ -1011,9 +1011,11 @@ void WBContext::init_finish_(WBOptions *options) {
+
+ _frontendCallbacks->show_status_text(_("Ready."));
+
++#if 0
+ // Avoid our runtime tests to lock up when a modal warning dialog is displayed.
+ if (options->open_at_startup_type != "run-script")
+ warnIfRunningOnUnsupportedOS();
++#endif
+
+ try {
+ // execute action requested from command line
Deleted: 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
===================================================================
--- 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch 2018-08-10 14:51:28 UTC (rev 370913)
+++ 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -1,146 +0,0 @@
-From 6fb2b4a97b8e9c066bdab62d24e38b9f3e5dbc79 Mon Sep 17 00:00:00 2001
-From: Marcin Szalowicz <marcin.szalowicz at oracle.com>
-Date: Mon, 11 Jun 2018 11:25:43 +0200
-Subject: [PATCH] Fix segfault in getIssueBanner, add missing wrappers
-
-make some private properties protected
----
- include/libssh/libsshpp.hpp | 73 ++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 62 insertions(+), 11 deletions(-)
-
-diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp
-index b8652f7..d1fa77b 100644
---- a/include/libssh/libsshpp.hpp
-+++ b/include/libssh/libsshpp.hpp
-@@ -194,6 +194,43 @@ public:
- ssh_throw(ret);
- return ret;
- }
-+
-+ /** @brief Authenticate through the "keyboard-interactive" method.
-+ * @param[in] The username to authenticate. You can specify NULL if ssh_option_set_username() has been used. You cannot try two different logins in a row.
-+ * @param[in] Undocumented. Set it to NULL.
-+ * @throws SshException on error
-+ * @returns SSH_AUTH_SUCCESS, SSH_AUTH_PARTIAL, SSH_AUTH_DENIED, SSH_AUTH_ERROR, SSH_AUTH_INFO, SSH_AUTH_AGAIN
-+ * @see ssh_userauth_kbdint
-+ */
-+ int userauthKbdint(const char* username, const char* submethods){
-+ int ret=ssh_userauth_kbdint(c_session,NULL,NULL);
-+ ssh_throw(ret);
-+ return ret;
-+ }
-+
-+ /** @brief Get the number of prompts (questions) the server has given.
-+ * @returns The number of prompts.
-+ * @see ssh_userauth_kbdint_getnprompts
-+ */
-+ int userauthKbdintGetNPrompts(){
-+ return ssh_userauth_kbdint_getnprompts(c_session);
-+ }
-+
-+ /** @brief Set the answer for a question from a message block..
-+ * @param[in] index The number of the ith prompt.
-+ * @param[in] The answer to give to the server. The answer MUST be encoded UTF-8. It is up to the server how to interpret the value and validate it. However, if you read the answer in some other encoding, you MUST convert it to UTF-8.
-+ * @throws SshException on error
-+ * @returns 0 on success, < 0 on error
-+ * @see ssh_userauth_kbdint_setanswer
-+ */
-+ int userauthKbdintSetAnswer(unsigned int i, const char* answer){
-+ int ret=ssh_userauth_kbdint_setanswer(c_session, i, answer);
-+ ssh_throw(ret);
-+ return ret;
-+ }
-+
-+
-+
- /** @brief Authenticates using the password method.
- * @param[in] password password to use for authentication
- * @throws SshException on error
-@@ -228,8 +265,7 @@ public:
- ssh_throw(ret);
- return ret;
- }
-- int userauthPrivatekeyFile(const char *filename,
-- const char *passphrase);
-+
- /** @brief Returns the available authentication methods from the server
- * @throws SshException on error
- * @returns Bitfield of available methods.
-@@ -281,8 +317,12 @@ public:
- */
- std::string getIssueBanner(){
- char *banner=ssh_get_issue_banner(c_session);
-- std::string ret= std::string(banner);
-- ::free(banner);
-+ std::string ret;
-+ if (banner)
-+ {
-+ ret= std::string(banner);
-+ ::free(banner);
-+ }
- return ret;
- }
- /** @brief returns the OpenSSH version (server) if possible
-@@ -378,11 +418,14 @@ public:
- return_throwable;
- }
-
--private:
-- ssh_session c_session;
- ssh_session getCSession(){
- return c_session;
- }
-+
-+protected:
-+ ssh_session c_session;
-+
-+private:
- /* No copy constructor, no = operator */
- Session(const Session &);
- Session& operator=(const Session &);
-@@ -481,12 +524,12 @@ public:
- ssh_throw(err);
- return err;
- }
-- int read(void *dest, size_t count, bool is_stderr){
-+ int read(void *dest, size_t count){
- int err;
- /* handle int overflow */
- if(count > 0x7fffffff)
- count = 0x7fffffff;
-- err=ssh_channel_read_timeout(channel,dest,count,is_stderr,-1);
-+ err=ssh_channel_read_timeout(channel,dest,count,false,-1);
- ssh_throw(err);
- return err;
- }
-@@ -584,16 +627,24 @@ public:
- ssh_throw(ret);
- return ret;
- }
--private:
-+
- ssh_session getCSession(){
- return session->getCSession();
- }
-+
-+ ssh_channel getCChannel() {
-+ return channel;
-+ }
-+
-+protected:
-+ Session *session;
-+ ssh_channel channel;
-+
-+private:
- Channel (Session &session, ssh_channel c_channel){
- this->channel=c_channel;
- this->session=&session;
- }
-- Session *session;
-- ssh_channel channel;
- /* No copy and no = operator */
- Channel(const Channel &);
- Channel &operator=(const Channel &);
---
-2.7.4
-
Copied: mysql-workbench/repos/community-x86_64/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch (from rev 370913, mysql-workbench/trunk/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch)
===================================================================
--- 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch (rev 0)
+++ 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -0,0 +1,146 @@
+From 6fb2b4a97b8e9c066bdab62d24e38b9f3e5dbc79 Mon Sep 17 00:00:00 2001
+From: Marcin Szalowicz <marcin.szalowicz at oracle.com>
+Date: Mon, 11 Jun 2018 11:25:43 +0200
+Subject: [PATCH] Fix segfault in getIssueBanner, add missing wrappers
+
+make some private properties protected
+---
+ include/libssh/libsshpp.hpp | 73 ++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 62 insertions(+), 11 deletions(-)
+
+diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp
+index b8652f7..d1fa77b 100644
+--- a/include/libssh/libsshpp.hpp
++++ b/include/libssh/libsshpp.hpp
+@@ -194,6 +194,43 @@ public:
+ ssh_throw(ret);
+ return ret;
+ }
++
++ /** @brief Authenticate through the "keyboard-interactive" method.
++ * @param[in] The username to authenticate. You can specify NULL if ssh_option_set_username() has been used. You cannot try two different logins in a row.
++ * @param[in] Undocumented. Set it to NULL.
++ * @throws SshException on error
++ * @returns SSH_AUTH_SUCCESS, SSH_AUTH_PARTIAL, SSH_AUTH_DENIED, SSH_AUTH_ERROR, SSH_AUTH_INFO, SSH_AUTH_AGAIN
++ * @see ssh_userauth_kbdint
++ */
++ int userauthKbdint(const char* username, const char* submethods){
++ int ret=ssh_userauth_kbdint(c_session,NULL,NULL);
++ ssh_throw(ret);
++ return ret;
++ }
++
++ /** @brief Get the number of prompts (questions) the server has given.
++ * @returns The number of prompts.
++ * @see ssh_userauth_kbdint_getnprompts
++ */
++ int userauthKbdintGetNPrompts(){
++ return ssh_userauth_kbdint_getnprompts(c_session);
++ }
++
++ /** @brief Set the answer for a question from a message block..
++ * @param[in] index The number of the ith prompt.
++ * @param[in] The answer to give to the server. The answer MUST be encoded UTF-8. It is up to the server how to interpret the value and validate it. However, if you read the answer in some other encoding, you MUST convert it to UTF-8.
++ * @throws SshException on error
++ * @returns 0 on success, < 0 on error
++ * @see ssh_userauth_kbdint_setanswer
++ */
++ int userauthKbdintSetAnswer(unsigned int i, const char* answer){
++ int ret=ssh_userauth_kbdint_setanswer(c_session, i, answer);
++ ssh_throw(ret);
++ return ret;
++ }
++
++
++
+ /** @brief Authenticates using the password method.
+ * @param[in] password password to use for authentication
+ * @throws SshException on error
+@@ -228,8 +265,7 @@ public:
+ ssh_throw(ret);
+ return ret;
+ }
+- int userauthPrivatekeyFile(const char *filename,
+- const char *passphrase);
++
+ /** @brief Returns the available authentication methods from the server
+ * @throws SshException on error
+ * @returns Bitfield of available methods.
+@@ -281,8 +317,12 @@ public:
+ */
+ std::string getIssueBanner(){
+ char *banner=ssh_get_issue_banner(c_session);
+- std::string ret= std::string(banner);
+- ::free(banner);
++ std::string ret;
++ if (banner)
++ {
++ ret= std::string(banner);
++ ::free(banner);
++ }
+ return ret;
+ }
+ /** @brief returns the OpenSSH version (server) if possible
+@@ -378,11 +418,14 @@ public:
+ return_throwable;
+ }
+
+-private:
+- ssh_session c_session;
+ ssh_session getCSession(){
+ return c_session;
+ }
++
++protected:
++ ssh_session c_session;
++
++private:
+ /* No copy constructor, no = operator */
+ Session(const Session &);
+ Session& operator=(const Session &);
+@@ -481,12 +524,12 @@ public:
+ ssh_throw(err);
+ return err;
+ }
+- int read(void *dest, size_t count, bool is_stderr){
++ int read(void *dest, size_t count){
+ int err;
+ /* handle int overflow */
+ if(count > 0x7fffffff)
+ count = 0x7fffffff;
+- err=ssh_channel_read_timeout(channel,dest,count,is_stderr,-1);
++ err=ssh_channel_read_timeout(channel,dest,count,false,-1);
+ ssh_throw(err);
+ return err;
+ }
+@@ -584,16 +627,24 @@ public:
+ ssh_throw(ret);
+ return ret;
+ }
+-private:
++
+ ssh_session getCSession(){
+ return session->getCSession();
+ }
++
++ ssh_channel getCChannel() {
++ return channel;
++ }
++
++protected:
++ Session *session;
++ ssh_channel channel;
++
++private:
+ Channel (Session &session, ssh_channel c_channel){
+ this->channel=c_channel;
+ this->session=&session;
+ }
+- Session *session;
+- ssh_channel channel;
+ /* No copy and no = operator */
+ Channel(const Channel &);
+ Channel &operator=(const Channel &);
+--
+2.7.4
+
Deleted: 0004-libssh-fix-read-config.patch
===================================================================
--- 0004-libssh-fix-read-config.patch 2018-08-10 14:51:28 UTC (rev 370913)
+++ 0004-libssh-fix-read-config.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -1,29 +0,0 @@
-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
-From: "Artyom V. Poptsov" <poptsov.artyom at gmail.com>
-Date: Sun, 4 Jun 2017 11:54:55 +0300
-Subject: config: Bugfix: Don't skip unseen opcodes
-
-libssh fails to read the configuration from a config file due to a
-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
-effectively skipping every opcode (and therefore every option) from
-the file. The change fixes that behaviour.
-
-Signed-off-by: Artyom V. Poptsov <poptsov.artyom at gmail.com>
-Reviewed-by: Andreas Schneider <asn at cryptomilk.org>
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 6478fc5f..519926e7 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
-
- opcode = ssh_config_get_opcode(keyword);
- if (*parsing == 1 && opcode != SOC_HOST) {
-- if (seen[opcode] == 0) {
-+ if (seen[opcode] != 0) {
- return 0;
- }
- seen[opcode] = 1;
Copied: mysql-workbench/repos/community-x86_64/0004-libssh-fix-read-config.patch (from rev 370913, mysql-workbench/trunk/0004-libssh-fix-read-config.patch)
===================================================================
--- 0004-libssh-fix-read-config.patch (rev 0)
+++ 0004-libssh-fix-read-config.patch 2018-08-10 14:51:36 UTC (rev 370914)
@@ -0,0 +1,29 @@
+From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom at gmail.com>
+Date: Sun, 4 Jun 2017 11:54:55 +0300
+Subject: config: Bugfix: Don't skip unseen opcodes
+
+libssh fails to read the configuration from a config file due to a
+wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
+effectively skipping every opcode (and therefore every option) from
+the file. The change fixes that behaviour.
+
+Signed-off-by: Artyom V. Poptsov <poptsov.artyom at gmail.com>
+Reviewed-by: Andreas Schneider <asn at cryptomilk.org>
+---
+ src/config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config.c b/src/config.c
+index 6478fc5f..519926e7 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
+
+ opcode = ssh_config_get_opcode(keyword);
+ if (*parsing == 1 && opcode != SOC_HOST) {
+- if (seen[opcode] == 0) {
++ if (seen[opcode] != 0) {
+ return 0;
+ }
+ seen[opcode] = 1;
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-10 14:51:28 UTC (rev 370913)
+++ PKGBUILD 2018-08-10 14:51:36 UTC (rev 370914)
@@ -1,198 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Alexandre Boily <alexandreboily at gmail.com>
-# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=mysql-workbench
-pkgver=8.0.12
-pkgrel=2
-_mysql_version=8.0.12
-_connector_version=8.0.12
-_gdal_version=2.3.1
-_boost_version=1.67.0
-_libssh_version=0.7.5
-pkgdesc='A cross-platform, visual database design tool developed by MySQL'
-arch=('x86_64')
-url='https://www.mysql.com/products/workbench/'
-license=('GPL2')
-depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3'
- 'hicolor-icon-theme' 'libgl' 'libsecret' 'libiodbc' 'libxml2'
- 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
- 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++' 'proj' 'json-c'
- 'antlr4-runtime')
-optdepends=('python2-pyodbc: database migration')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' 'antlr4')
-validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5' # MySQL Release Engineering <mysql-build at oss.oracle.com>
- '8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org> (for libssh)
-source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
- "https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
- "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}-src.tar.gz"{,.asc}
- "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz"
- "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
- "https://www.libssh.org/files/${_libssh_version%.*}/libssh-${_libssh_version}.tar."{xz,asc}
- '0001-mysql-workbench-no-check-for-updates.patch'
- '0002-disable-unsupported-operating-system-warning.patch'
- '0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch'
- '0004-libssh-fix-read-config.patch'
- 'arch_linux_profile.xml')
-sha256sums=('0241586c95026a7d4d1b552ba2e33d8e66f6826e8f7e1a692b78c405f80cd334'
- 'SKIP'
- '69f16e20834dbc60cb28d6df7351deda323330b9de685d22415f135bcedd1b20'
- 'SKIP'
- '47d9f152988fe205350a6d31d032692a6777f838a886c3b3dc7af3b0652fdd50'
- 'SKIP'
- '9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a'
- '2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
- '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
- 'SKIP'
- 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
- '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
- 'f15d8c8b3cc74d2d0b792316834648620fc2299ce103c6419f4c562f759ad755'
- 'fe877d6be0b6e97361d8d841b3cbf9dc36b34d3ba92d5ba50af0f23487ac786a'
- '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
-
-prepare() {
- cd "${srcdir}/libssh-${_libssh_version}"
-
- # from libssh package
- patch -Np1 < "${srcdir}"/0004-libssh-fix-read-config.patch
- # required for mysql-workbench
- # TODO: drop bundled libssh when this is merged upstream and hits our package
- patch -Np1 < "${srcdir}"/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
-
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- # Disable 'Help' -> 'Check for Updates'
- # Updates are provided via Arch Linux packages
- patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
-
- # disable unsupported operating system warning
- patch -Np1 < "${srcdir}"/0002-disable-unsupported-operating-system-warning.patch
-
- # GCC 7.x introduced some new warnings, remove '-Werror' for the build to complete
- sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt
-
- # GCC 7.x complains about unsupported flag
- sed -i 's|-Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
-
- # disable stringop-truncation for GCC 8.x
- sed -i '/^set/s|-Wall|-Wall -Wno-stringop-truncation|' CMakeLists.txt
-
- # make sure to link against bundled libraries
- sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt
-}
-
-build() {
- # Build mysql
- mkdir "${srcdir}/mysql-${_mysql_version}-build"
- cd "${srcdir}/mysql-${_mysql_version}-build"
- msg "Configure mysql"
- cmake "${srcdir}/mysql-${_mysql_version}" \
- -DWITHOUT_SERVER=ON \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
- msg "Build mysql"
- make
- msg "Install mysql"
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build mysql-connector-c++
- mkdir "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
- cd "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
- msg "Configure mysql-connector-c++"
- cmake "${srcdir}/mysql-connector-c++-${_connector_version}-src" \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DINSTALL_LIB_DIR=lib \
- -DMYSQL_DIR="${srcdir}/install-bundle/" \
- -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DWITH_JDBC=ON
- msg "Build mysql-connector-c++"
- make
- msg "Install mysql-connector-c++"
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build gdal
- cd "${srcdir}/gdal-${_gdal_version}"
- msg "Configure gdal"
- ./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
- --with-curl \
- --without-jasper
- msg "Build gdal"
- make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/"
- msg "Install gdal"
- make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" DESTDIR="${srcdir}/install-bundle/" install
-
- # Build libssh
- mkdir "${srcdir}/libssh-${_libssh_version}-build"
- cd "${srcdir}/libssh-${_libssh_version}-build"
- msg "Configure libssh"
- cmake "${srcdir}/libssh-${_libssh_version}" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_GSSAPI=OFF \
- -DWITH_GCRYPT=ON \
- -DWITH_TESTING=OFF
- msg "Build libssh"
- make
- msg "Install libssh"
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build MySQL Workbench itself with bundled libs
- mkdir "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
- msg "Configure mysql-workbench"
- cmake "${srcdir}/mysql-workbench-community-${pkgver}-src" \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-std=c++11" \
- -DCMAKE_BUILD_TYPE=Release \
- -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DMySQLCppConn_LIBRARY="${srcdir}/install-bundle/usr/lib/libmysqlcppconn.so" \
- -DMySQLCppConn_INCLUDE_DIR="${srcdir}/install-bundle/usr/include/jdbc" \
- -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
- -DLibSSH_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
- -DLibSSH_LIBRARY="${srcdir}/install-bundle/usr/lib/libssh.so" \
- -DWITH_ANTLR_JAR='/usr/share/java/antlr-complete.jar' \
- -DUSE_BUNDLED_MYSQLDUMP=1
- msg "Build mysql-workbench"
- make
-}
-
-package() {
- # install bundled libraries files and files
- for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\|ssh\(\|_threads\)\)\.so\..*'); do
- install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
- done
- for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\|ssh\(\|_threads\)\)\.so\..*'); do
- ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
- done
- install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
-
- # install MySQL Workbench itself
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
-
- make DESTDIR="${pkgdir}" install
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- convert -scale ${SIZE} \
- "${srcdir}/mysql-workbench-community-${pkgver}-src/images/icons/MySQLWorkbench-128.png" \
- "${srcdir}/mysql-workbench.png"
- install -D -m0644 "${srcdir}/mysql-workbench.png" "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
- done
-
- install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
- "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
-}
-
Copied: mysql-workbench/repos/community-x86_64/PKGBUILD (from rev 370913, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-10 14:51:36 UTC (rev 370914)
@@ -0,0 +1,198 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=8.0.12
+pkgrel=3
+_mysql_version=8.0.12
+_connector_version=8.0.12
+_gdal_version=2.3.1
+_boost_version=1.67.0
+_libssh_version=0.7.5
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3'
+ 'hicolor-icon-theme' 'libgl' 'libsecret' 'libiodbc' 'libxml2'
+ 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo'
+ 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++' 'proj' 'json-c'
+ 'antlr4-runtime')
+optdepends=('python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' 'antlr4')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5' # MySQL Release Engineering <mysql-build at oss.oracle.com>
+ '8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org> (for libssh)
+source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
+ "https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
+ "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}-src.tar.gz"{,.asc}
+ "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz"
+ "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
+ "https://www.libssh.org/files/${_libssh_version%.*}/libssh-${_libssh_version}.tar."{xz,asc}
+ '0001-mysql-workbench-no-check-for-updates.patch'
+ '0002-disable-unsupported-operating-system-warning.patch'
+ '0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch'
+ '0004-libssh-fix-read-config.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('0241586c95026a7d4d1b552ba2e33d8e66f6826e8f7e1a692b78c405f80cd334'
+ 'SKIP'
+ '69f16e20834dbc60cb28d6df7351deda323330b9de685d22415f135bcedd1b20'
+ 'SKIP'
+ '47d9f152988fe205350a6d31d032692a6777f838a886c3b3dc7af3b0652fdd50'
+ 'SKIP'
+ '9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a'
+ '2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
+ '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
+ 'SKIP'
+ 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
+ '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+ 'f15d8c8b3cc74d2d0b792316834648620fc2299ce103c6419f4c562f759ad755'
+ 'fe877d6be0b6e97361d8d841b3cbf9dc36b34d3ba92d5ba50af0f23487ac786a'
+ '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+prepare() {
+ cd "${srcdir}/libssh-${_libssh_version}"
+
+ # from libssh package
+ patch -Np1 < "${srcdir}"/0004-libssh-fix-read-config.patch
+ # required for mysql-workbench
+ # TODO: drop bundled libssh when this is merged upstream and hits our package
+ patch -Np1 < "${srcdir}"/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
+
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # Disable 'Help' -> 'Check for Updates'
+ # Updates are provided via Arch Linux packages
+ patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
+
+ # disable unsupported operating system warning
+ patch -Np1 < "${srcdir}"/0002-disable-unsupported-operating-system-warning.patch
+
+ # GCC 7.x introduced some new warnings, remove '-Werror' for the build to complete
+ sed -i '/^set/s|-Werror -Wall|-Wall|' CMakeLists.txt
+
+ # GCC 7.x complains about unsupported flag
+ sed -i 's|-Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
+
+ # disable stringop-truncation for GCC 8.x
+ sed -i '/^set/s|-Wall|-Wall -Wno-stringop-truncation|' CMakeLists.txt
+
+ # make sure to link against bundled libraries
+ sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt
+}
+
+build() {
+ # Build mysql
+ mkdir "${srcdir}/mysql-${_mysql_version}-build"
+ cd "${srcdir}/mysql-${_mysql_version}-build"
+ msg "Configure mysql"
+ cmake "${srcdir}/mysql-${_mysql_version}" \
+ -DWITHOUT_SERVER=ON \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
+ msg "Build mysql"
+ make
+ msg "Install mysql"
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build mysql-connector-c++
+ mkdir "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
+ cd "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
+ msg "Configure mysql-connector-c++"
+ cmake "${srcdir}/mysql-connector-c++-${_connector_version}-src" \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DINSTALL_LIB_DIR=lib \
+ -DMYSQL_DIR="${srcdir}/install-bundle/" \
+ -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DWITH_JDBC=ON
+ msg "Build mysql-connector-c++"
+ make
+ msg "Install mysql-connector-c++"
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}"
+ msg "Configure gdal"
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl \
+ --without-jasper
+ msg "Build gdal"
+ make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/"
+ msg "Install gdal"
+ make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build libssh
+ mkdir "${srcdir}/libssh-${_libssh_version}-build"
+ cd "${srcdir}/libssh-${_libssh_version}-build"
+ msg "Configure libssh"
+ cmake "${srcdir}/libssh-${_libssh_version}" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_GSSAPI=OFF \
+ -DWITH_GCRYPT=ON \
+ -DWITH_TESTING=OFF
+ msg "Build libssh"
+ make
+ msg "Install libssh"
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build MySQL Workbench itself with bundled libs
+ mkdir "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
+ msg "Configure mysql-workbench"
+ cmake "${srcdir}/mysql-workbench-community-${pkgver}-src" \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++14" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DMySQLCppConn_LIBRARY="${srcdir}/install-bundle/usr/lib/libmysqlcppconn.so" \
+ -DMySQLCppConn_INCLUDE_DIR="${srcdir}/install-bundle/usr/include/jdbc" \
+ -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
+ -DLibSSH_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DLibSSH_LIBRARY="${srcdir}/install-bundle/usr/lib/libssh.so" \
+ -DWITH_ANTLR_JAR='/usr/share/java/antlr-complete.jar' \
+ -DUSE_BUNDLED_MYSQLDUMP=1
+ msg "Build mysql-workbench"
+ make
+}
+
+package() {
+ # install bundled libraries files and files
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\|ssh\)\.so\..*'); do
+ install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
+ done
+ for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\|ssh\)\.so\..*'); do
+ ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
+ done
+ install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
+
+ # install MySQL Workbench itself
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
+
+ make DESTDIR="${pkgdir}" install
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ convert -scale ${SIZE} \
+ "${srcdir}/mysql-workbench-community-${pkgver}-src/images/icons/MySQLWorkbench-128.png" \
+ "${srcdir}/mysql-workbench.png"
+ install -D -m0644 "${srcdir}/mysql-workbench.png" "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+ done
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+ "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
+}
+
Deleted: arch_linux_profile.xml
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-x86_64/arch_linux_profile.xml (from rev 370913, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list