From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 387F315800F for ; Sun, 8 Jan 2023 10:38:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80F04E0826; Sun, 8 Jan 2023 10:38:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6849EE0826 for ; Sun, 8 Jan 2023 10:38:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92854341021 for ; Sun, 8 Jan 2023 10:38:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C35E76B for ; Sun, 8 Jan 2023 10:38:52 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1673174326.cee5dba7eb4c5c237ead73115dd95c9f0040cf49.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild X-VCS-Directories: dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: cee5dba7eb4c5c237ead73115dd95c9f0040cf49 X-VCS-Branch: master Date: Sun, 8 Jan 2023 10:38:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 225dc39a-884c-4619-a100-d4f078ad0c2d X-Archives-Hash: 276413b3915942b109fc7a6720136430 commit: cee5dba7eb4c5c237ead73115dd95c9f0040cf49 Author: Hans de Graaff gentoo org> AuthorDate: Sun Jan 8 10:37:25 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jan 8 10:38:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee5dba7 dev-db/mysql-workbench: update dependencies mysql-workbench fails to compile with newer antlr-cpp versions and requires a newer libssh. Bug: https://bugs.gentoo.org/889534 Closes: https://bugs.gentoo.org/832688 Signed-off-by: Hans de Graaff gentoo.org> .../mysql-workbench-8.0.31-r1.ebuild | 110 +++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild new file mode 100644 index 000000000000..c7a0d71a3016 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_REQ_USE="sqlite" + +ANTLR_VERSION=4.9.1 + +inherit gnome2 flag-o-matic python-single-r1 cmake + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz + https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + app-crypt/libsecret + dev-libs/glib:2 + =dev-cpp/glibmm-2.14:2 + dev-cpp/gtkmm:3.0 + dev-libs/atk + >=net-libs/libssh-0.9.5[server] + x11-libs/pango + x11-libs/gtk+:3 + >=x11-libs/cairo-1.5.12[glib,svg(+)] + >=dev-libs/rapidjson-1.1.0 + dev-libs/libsigc++:2 + dev-libs/boost[nls] + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + dev-libs/libpcre[cxx] + >=sci-libs/gdal-1.11.1-r1 + virtual/opengl + || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + >=dev-db/mysql-connector-c++-8.0.27-r1 + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 +" + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" + "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch" +) + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + ## And avoid -Werror + sed -i -e 's/-Werror//' CMakeLists.txt || die + ## Fix doc install directory + sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake_src_prepare +} + +src_configure() { + if has_version dev-db/libiodbc ; then + IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" + fi + + append-cxxflags -std=c++11 + ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" + local mycmakeargs=( + -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DIODBC_INCLUDE_PATH="/usr/include/iodbc" + ${IODBC} + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" + ) + cmake_src_configure +}