[arch-commits] Commit in mysql-workbench/repos (6 files)
Felix Yan
felixonmars at gemini.archlinux.org
Fri Dec 3 14:25:19 UTC 2021
Date: Friday, December 3, 2021 @ 14:25:19
Author: felixonmars
Revision: 1064799
archrelease: copy trunk to community-staging-x86_64
Added:
mysql-workbench/repos/community-staging-x86_64/
mysql-workbench/repos/community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 1064798, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-staging-x86_64/0002-disable-unsupported-operating-system-warning.patch
(from rev 1064798, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-staging-x86_64/0003-python-3-10-parser.patch
(from rev 1064798, mysql-workbench/trunk/0003-python-3-10-parser.patch)
mysql-workbench/repos/community-staging-x86_64/PKGBUILD
(from rev 1064798, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-staging-x86_64/arch_linux_profile.xml
(from rev 1064798, mysql-workbench/trunk/arch_linux_profile.xml)
---------------------------------------------------------+
0001-mysql-workbench-no-check-for-updates.patch | 30 ++
0002-disable-unsupported-operating-system-warning.patch | 26 ++
0003-python-3-10-parser.patch | 49 ++++
PKGBUILD | 168 ++++++++++++++
4 files changed, 273 insertions(+)
Copied: mysql-workbench/repos/community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 1064798, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch (rev 0)
+++ community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch 2021-12-03 14:25:19 UTC (rev 1064799)
@@ -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>
Copied: mysql-workbench/repos/community-staging-x86_64/0002-disable-unsupported-operating-system-warning.patch (from rev 1064798, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
===================================================================
--- community-staging-x86_64/0002-disable-unsupported-operating-system-warning.patch (rev 0)
+++ community-staging-x86_64/0002-disable-unsupported-operating-system-warning.patch 2021-12-03 14:25:19 UTC (rev 1064799)
@@ -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
Copied: mysql-workbench/repos/community-staging-x86_64/0003-python-3-10-parser.patch (from rev 1064798, mysql-workbench/trunk/0003-python-3-10-parser.patch)
===================================================================
--- community-staging-x86_64/0003-python-3-10-parser.patch (rev 0)
+++ community-staging-x86_64/0003-python-3-10-parser.patch 2021-12-03 14:25:19 UTC (rev 1064799)
@@ -0,0 +1,49 @@
+diff --git a/library/grt/src/python_context.cpp b/library/grt/src/python_context.cpp
+index 49ea3ce..a6f59f2 100644
+--- a/library/grt/src/python_context.cpp
++++ b/library/grt/src/python_context.cpp
+@@ -31,7 +31,6 @@
+ #include "base/wb_memory.h"
+
+ // python internals
+-#include <node.h>
+ #include <errcode.h>
+ #include <token.h>
+ #include <frameobject.h>
+@@ -1598,7 +1597,7 @@ int PythonContext::run_file(const std::string &file, bool interactive) {
+ If line_buffer is null, the passed buffer will be expected to contain complete code.
+ */
+ int PythonContext::run_buffer(const std::string &buffer, std::string *line_buffer) {
+- node *n;
++ PyObject *n;
+ PyObject *result;
+ PyObject *mainmod;
+ PyObject *globals;
+@@ -1617,8 +1616,16 @@ int PythonContext::run_buffer(const std::string &buffer, std::string *line_buffe
+
+ WillEnterPython lock;
+
+- n = PyParser_SimpleParseStringFlags(line_buffer ? line_buffer->c_str() : buffer.c_str(),
+- line_buffer ? Py_single_input : Py_file_input, 0);
++ /* The changelog says:
++ A call to PyParser_SimpleParseStringFlags followed by PyNode_Compile can
++ be replaced by calling Py_CompileString().
++
++ We do not have PyNode_Compile()... But looks like `n` is not used anyway.
++
++ https://docs.python.org/3/whatsnew/3.10.html#changes-in-the-c-api */
++
++ n = Py_CompileString(line_buffer ? line_buffer->c_str() : buffer.c_str(), NULL,
++ line_buffer ? Py_single_input : Py_file_input);
+
+ if (n && (!buffer.empty() && (buffer[0] == ' ' || buffer[0] == '\t')) && line_buffer) {
+ return 0; // continued line
+@@ -1651,7 +1658,7 @@ int PythonContext::run_buffer(const std::string &buffer, std::string *line_buffe
+ return -1;
+ }
+
+- PyNode_Free(n);
++ Py_DECREF(n);
+ PyErr_Clear();
+
+ // command is supposedly complete, try to execute it
Copied: mysql-workbench/repos/community-staging-x86_64/PKGBUILD (from rev 1064798, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-12-03 14:25:19 UTC (rev 1064799)
@@ -0,0 +1,168 @@
+# 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.27
+pkgrel=3
+_mysql_version=${pkgver}
+_connector_version=${pkgver}
+_gdal_version=3.3.1
+_boost_version=1.73.0
+_antlr4_version=4.9.3
+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' 'antlr4-runtime' 'curl' 'desktop-file-utils' 'freetype2' 'giflib'
+ 'gtkmm3' 'hicolor-icon-theme' 'json-c' 'libgl' 'libsecret' 'libssh'
+ 'libxml2' 'libzip' 'pcre' 'proj' 'python' 'rapidjson' 'unixodbc'
+ 'vsqlite++' 'zstd')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' "antlr4=${_antlr4_version}")
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') # MySQL Release Engineering <mysql-build at oss.oracle.com>
+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}
+ "https://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"
+ '0001-mysql-workbench-no-check-for-updates.patch'
+ '0002-disable-unsupported-operating-system-warning.patch'
+ '0003-python-3-10-parser.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('fd7c821e61ed559f3d280199b441785723c4b79ae41afb9f68ad3b5cc8f3e124'
+ 'SKIP'
+ '4a7e72f899e6f24bcd479d378edd2f32f583e687f93a26291774815d5a549b97'
+ 'SKIP'
+ '5886698fc682a5e8740822ed9b461bc51b60cf9cbadf4e1c7febe59584b2bfb7'
+ 'SKIP'
+ '48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70'
+ '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+ 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
+ '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+ '9de0ceba08037f15c12f730e4764d08a03813b5c59ed4c8b4d0cfbbcb82d1738'
+ '3a59b46ac2e7c6a0a72733d71ca33ec85146e8399a3f23871cb3a965cd8e749e')
+
+prepare() {
+ 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
+
+ # Python 3.10 removed the parser module, which was deprecated in 3.9 due
+ # to the switch to the new PEG parser...
+ patch -Np1 < "${srcdir}"/0003-python-3-10-parser.patch
+
+ # remove '-Werror'
+ sed -i '/^\s*set/s| -Werror||' CMakeLists.txt
+
+ # GCC 7.x complains about unsupported flag
+ sed -i 's| -Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
+
+ # be happy with more recent antlr
+ sed -i "/set(ANTLR_JAR_FILENAME/s/4.9.1/${_antlr4_version}/" CMakeLists.txt
+}
+
+build() {
+ # Build mysql
+ mkdir "${srcdir}/mysql-${_mysql_version}-build"
+ cd "${srcdir}/mysql-${_mysql_version}-build"
+ echo "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//./_}"
+ echo "Build mysql..."
+ make
+ echo "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"
+ echo "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
+ echo "Build mysql-connector-c++..."
+ make
+ echo "Install mysql-connector-c++..."
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}"
+ echo "Configure gdal..."
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl \
+ --without-jasper
+ echo "Build gdal..."
+ make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/"
+ echo "Install gdal..."
+ make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" 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"
+ echo "Configure mysql-workbench..."
+ cmake "${srcdir}/mysql-workbench-community-${pkgver}-src" \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++17" \
+ -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" \
+ -DWITH_ANTLR_JAR='/usr/share/java/antlr-complete.jar' \
+ -DUSE_BUNDLED_MYSQLDUMP=1
+ echo "Build mysql-workbench..."
+ make
+}
+
+package() {
+ # install bundled libraries
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ BASENAME="$(basename "${LIBRARY}")"
+ SONAME="$(readelf -d "${LIBRARY}" | grep -Po '(?<=(Library soname: \[)).*(?=\])')"
+ install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"${BASENAME}"
+ ln -s "${BASENAME}" "${pkgdir}"/usr/lib/mysql-workbench/"${SONAME}"
+ done
+
+ # install bundled mysql and mysqldump
+ 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
+ # set modify/create for reproducible builds
+ convert -scale ${SIZE} +set date:create +set date:modify \
+ "${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-staging-x86_64/arch_linux_profile.xml (from rev 1064798, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list