Date: Thursday, March 18, 2021 @ 21:20:03
Author: eworm
Revision: 894524
archrelease: copy trunk to community-testing-x86_64
Added:
mysql-workbench/repos/community-testing-x86_64/
mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 894523,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-testing-x86_64/0002-disable-unsupported-operating-system-warning.patch
(from rev 894523,
mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-testing-x86_64/0003-find-libssh.patch
(from rev 894523, mysql-workbench/trunk/0003-find-libssh.patch)
mysql-workbench/repos/community-testing-x86_64/PKGBUILD
(from rev 894523, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-testing-x86_64/arch_linux_profile.xml
(from rev 894523, 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-find-libssh.patch | 13 +
PKGBUILD | 174 ++++++++++++++
4 files changed, 243 insertions(+)
Copied:
mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 894523,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(rev 0)
+++ community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
2021-03-18 21:20:03 UTC (rev 894524)
@@ -0,0 +1,30 @@
+From d15e588be02e44b1317bf90ff7be1714267281c8 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@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 <m...@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-testing-x86_64/0002-disable-unsupported-operating-system-warning.patch
(from rev 894523,
mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
===================================================================
---
community-testing-x86_64/0002-disable-unsupported-operating-system-warning.patch
(rev 0)
+++
community-testing-x86_64/0002-disable-unsupported-operating-system-warning.patch
2021-03-18 21:20:03 UTC (rev 894524)
@@ -0,0 +1,26 @@
+From 98a9974f550dfb5c8f66213774e4ef95848127e1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@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 <m...@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-testing-x86_64/0003-find-libssh.patch
(from rev 894523, mysql-workbench/trunk/0003-find-libssh.patch)
===================================================================
--- community-testing-x86_64/0003-find-libssh.patch
(rev 0)
+++ community-testing-x86_64/0003-find-libssh.patch 2021-03-18 21:20:03 UTC
(rev 894524)
@@ -0,0 +1,13 @@
+diff --git a/build/cmake/Modules/FindLibSSH.cmake
b/build/cmake/Modules/FindLibSSH.cmake
+index 3d31ed3..acbe292 100644
+--- a/build/cmake/Modules/FindLibSSH.cmake
++++ b/build/cmake/Modules/FindLibSSH.cmake
+@@ -51,7 +51,7 @@ else()
+ find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
+ endif()
+
+-set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
++set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
+ file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define
LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+ if (LibSSH_VERSION_LINE_MAJOR)
+ file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define
LIBSSH_VERSION_MINOR[ ]+[0-9]+")
Copied: mysql-workbench/repos/community-testing-x86_64/PKGBUILD (from rev
894523, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-03-18 21:20:03 UTC (rev 894524)
@@ -0,0 +1,174 @@
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Contributor: Alexandre Boily <alexandrebo...@gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalc...@gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=8.0.23
+pkgrel=3
+_mysql_version=${pkgver}
+_connector_version=${pkgver}
+_gdal_version=3.2.1
+_boost_version=1.73.0
+_antlr4_version=4.9.2
+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-bu...@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-find-libssh.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('832c1172d7664231cad8f4b91f965fa10eabdc6bc03da4307e4b923559ef120b'
+ 'SKIP'
+ 'd26cbbf9eccf8c8f14743c3e26c37a8ba71ebd45e8b2d66c6dd37790037bb787'
+ 'SKIP'
+ '9af06495a6a080fed62da70978f1cb0c66f058edd5ea9eda9345a64bf8ec688f'
+ 'SKIP'
+ '6c588b58fcb63ff3f288eb9f02d76791c0955ba9210d98c3abd879c770ae28ea'
+ '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+ 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
+ '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+ 'ee1c65acf41c18842b5d94aeea785b10b68d4d4e5cf2ffc8b63a93484523477c'
+ '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
+
+ # version macros moved to libssh/libssh_version.h
+ patch -Np1 < "${srcdir}"/0003-find-libssh.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
+
+ # be happy with more recent antlr
+ sed -i "/set(ANTLR_JAR_FILENAME/s/4.7.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-testing-x86_64/arch_linux_profile.xml
(from rev 894523, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
