[arch-commits] Commit in mysql-workbench/repos (5 files)

Evangelos Foutras foutrelis at archlinux.org
Mon Apr 27 19:22:40 UTC 2020


    Date: Monday, April 27, 2020 @ 19:22:40
  Author: foutrelis
Revision: 621921

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 621920, 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 621920, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
  mysql-workbench/repos/community-staging-x86_64/PKGBUILD
    (from rev 621920, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-staging-x86_64/arch_linux_profile.xml
    (from rev 621920, mysql-workbench/trunk/arch_linux_profile.xml)

---------------------------------------------------------+
 0001-mysql-workbench-no-check-for-updates.patch         |   30 ++
 0002-disable-unsupported-operating-system-warning.patch |   26 ++
 PKGBUILD                                                |  170 ++++++++++++++
 3 files changed, 226 insertions(+)

Copied: mysql-workbench/repos/community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 621920, 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	2020-04-27 19:22:40 UTC (rev 621921)
@@ -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 621920, 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	2020-04-27 19:22:40 UTC (rev 621921)
@@ -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/PKGBUILD (from rev 621920, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-27 19:22:40 UTC (rev 621921)
@@ -0,0 +1,170 @@
+# 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.20
+pkgrel=3
+_mysql_version=${pkgver}
+_connector_version=${pkgver}
+_gdal_version=3.0.4
+_boost_version=1.70.0
+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' 'desktop-file-utils' 'freetype2' 'gtkmm3'
+	'hicolor-icon-theme' 'libgl' 'libsecret' 'libiodbc' 'libxml2'
+	'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo' 'libssh'
+	'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++' 'proj' 'json-c'
+	'antlr4-runtime' 'giflib' 'zstd' 'curl' 'rapidjson')
+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>
+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'
+	'arch_linux_profile.xml')
+sha256sums=('06e2b2119b944e40e0ca49a29edf90ff6b02dde6916cb2b83b915e879d781130'
+            'SKIP'
+            '4d62eaca43cd9c858baca10d02857382887507a17ffdbfa97daf107d0c62ee5f'
+            'SKIP'
+            '50eaebd1d59b5681b6959a8c5b95bdeeffd021db0f06264eb497706dbc5b39cb'
+            'SKIP'
+            '5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277'
+            '430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778'
+            'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
+            '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
+            '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+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
+
+	# 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/4.8/' 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++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" \
+		-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 621920, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)


More information about the arch-commits mailing list