[arch-commits] Commit in mysql-workbench/repos (7 files)
Christian Hesse
eworm at gemini.archlinux.org
Tue Jun 28 11:38:08 UTC 2022
Date: Tuesday, June 28, 2022 @ 11:38:08
Author: eworm
Revision: 1239826
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 1239825, 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 1239825, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-staging-x86_64/0003-include-list.patch
(from rev 1239825, mysql-workbench/trunk/0003-include-list.patch)
mysql-workbench/repos/community-staging-x86_64/PKGBUILD
(from rev 1239825, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-staging-x86_64/arch_linux_profile.xml
(from rev 1239825, mysql-workbench/trunk/arch_linux_profile.xml)
mysql-workbench/repos/community-staging-x86_64/keys/
---------------------------------------------------------+
0001-mysql-workbench-no-check-for-updates.patch | 30 ++
0002-disable-unsupported-operating-system-warning.patch | 26 +
0003-include-list.patch | 12
PKGBUILD | 192 ++++++++++++++
4 files changed, 260 insertions(+)
Copied: mysql-workbench/repos/community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 1239825, 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 2022-06-28 11:38:08 UTC (rev 1239826)
@@ -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 1239825, 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 2022-06-28 11:38:08 UTC (rev 1239826)
@@ -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-include-list.patch (from rev 1239825, mysql-workbench/trunk/0003-include-list.patch)
===================================================================
--- community-staging-x86_64/0003-include-list.patch (rev 0)
+++ community-staging-x86_64/0003-include-list.patch 2022-06-28 11:38:08 UTC (rev 1239826)
@@ -0,0 +1,12 @@
+diff --git a/library/parsers/mysql/MySQLBaseLexer.h b/library/parsers/mysql/MySQLBaseLexer.h
+index 1a8b9ac..8bd3d57 100644
+--- a/library/parsers/mysql/MySQLBaseLexer.h
++++ b/library/parsers/mysql/MySQLBaseLexer.h
+@@ -26,6 +26,7 @@
+ #include "Lexer.h"
+ #include "MySQLRecognizerCommon.h"
+ #include "mysql-recognition-types.h"
++#include <list>
+
+ namespace antlr4 {
+ class PARSERS_PUBLIC_TYPE Lexer;
Copied: mysql-workbench/repos/community-staging-x86_64/PKGBUILD (from rev 1239825, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2022-06-28 11:38:08 UTC (rev 1239826)
@@ -0,0 +1,192 @@
+# 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.29
+pkgrel=2
+_mysql_version=${pkgver}
+_connector_version=${pkgver}
+_gdal_version=3.5.0
+_boost_version=1.77.0
+# bump the antlr4 version as required, this is to match the jar file name
+_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'
+ # tmporary fix for antlr4...
+ #"antlr4=${_antlr4_version}"
+ 'git'
+)
+validpgpkeys=('859BE8D7C586F538430B19C2467B942D3A79BD29') # 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"
+ 'https://www.antlr.org/download/antlr-4.9.3-complete.jar'
+ 'https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip'
+ '0001-mysql-workbench-no-check-for-updates.patch'
+ '0002-disable-unsupported-operating-system-warning.patch'
+ '0003-include-list.patch'
+ 'arch_linux_profile.xml')
+sha256sums=('837d744e4bd988f5ba2db7f64117aa4132c8babd747d323c3e9599ff1dc3aeee'
+ 'SKIP'
+ '512170fa6f78a694d6f18d197e999d2716ee68dc541d7644dd922a3663407266'
+ 'SKIP'
+ '9a6236a28bca33ae951d8ccaabb8ff51a188863e8599f9096f4ae0a1da19f87f'
+ 'SKIP'
+ 'd49121e5348a51659807be4fb866aa840f8dbec4d1acba6d17fdefa72125bfc9'
+ 'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854'
+ 'afcd40946d3de4d81e28d7c88d467289e0587285d27adb172aecc5494a17df36'
+ '5f0af6efd81f476c3e775c486eb0a71c25d6bbc14373e88a64690e2738d68e03'
+ 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
+ '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+ 'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53'
+ 'd816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265')
+
+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
+
+ # add missing include
+ patch -Np1 < "${srcdir}"/0003-include-list.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
+
+ # temporary fix until wb builds against antlr4-runtime 4.10.x...
+ mkdir "${srcdir}/antlr4-build"
+ cd "${srcdir}/antlr4-build"
+ cmake ../ \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_CXX_STANDARD=17 \
+ -DANTLR4_INSTALL=ON \
+ -DINSTALL_GTEST=OFF
+ make
+ 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"
+ 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" \
+ -DANTLR4_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+ -DANTLR4_LIBRARY="${srcdir}/install-bundle/usr/lib/libantlr4-runtime.so" \
+ -DWITH_ANTLR_JAR="${srcdir}/antlr-4.9.3-complete.jar" \
+ -DUNIXODBC_INCLUDE_DIR='/usr/include' \
+ -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 -D -m0755 "${srcdir}/install-bundle/usr/lib/libantlr4-runtime.so.4.9.3" "${pkgdir}/usr/lib/mysql-workbench/libantlr4-runtime.so.4.9.3"
+
+ # 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 1239825, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list