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 CEC2F15800A for ; Thu, 10 Aug 2023 04:46:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3DB02BC021; Thu, 10 Aug 2023 04:46:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id D85012BC021 for ; Thu, 10 Aug 2023 04:46:08 +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 EB0B7335D27 for ; Thu, 10 Aug 2023 04:46:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E12F13 for ; Thu, 10 Aug 2023 04:46:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691642753.4711b0ec2776941c3dbc2e23a28fb4fae4197e36.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-7.0.1-r1.ebuild sci-electronics/kicad/kicad-7.0.1.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4711b0ec2776941c3dbc2e23a28fb4fae4197e36 X-VCS-Branch: master Date: Thu, 10 Aug 2023 04:46:06 +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: effd507b-84c2-4c68-93fa-a8a12e72428a X-Archives-Hash: 7955a314575f52debbef3fd5089a2f47 commit: 4711b0ec2776941c3dbc2e23a28fb4fae4197e36 Author: Zoltan Puskas sinustrom info> AuthorDate: Thu Aug 10 04:24:20 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 10 04:45:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4711b0ec sci-electronics/kicad: Revert EGL flag for stable In stable wxGTK is still built with EGL instead of GLX, so build KiCAD with EGL enabled, but also limit the wxGTK version to prevent build failures, in case GLX enabled wxGTK goes stable or the user unmasks it. Since users cannot upgrade to -r1 due to build failures, it's better to revert to no revision version. This should prevent unnecessary rebuilds for anyone who has KiCad already installed. Bug: https://bugs.gentoo.org/911120 Signed-off-by: Zoltan Puskas sinustrom.info> Closes: https://github.com/gentoo/gentoo/pull/32240 Signed-off-by: Sam James gentoo.org> .../kicad/{kicad-7.0.1-r1.ebuild => kicad-7.0.1.ebuild} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sci-electronics/kicad/kicad-7.0.1-r1.ebuild b/sci-electronics/kicad/kicad-7.0.1.ebuild similarity index 94% rename from sci-electronics/kicad/kicad-7.0.1-r1.ebuild rename to sci-electronics/kicad/kicad-7.0.1.ebuild index 180b6e88f864..1ecc9a04ae5a 100644 --- a/sci-electronics/kicad/kicad-7.0.1-r1.ebuild +++ b/sci-electronics/kicad/kicad-7.0.1.ebuild @@ -35,6 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Contains bundled pybind but it's patched for wx # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 COMMON_DEPEND=" dev-db/unixODBC dev-libs/boost:=[context,nls] @@ -46,7 +47,7 @@ COMMON_DEPEND=" >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + <=x11-libs/wxGTK-3.2.2.1-r2:${WX_GTK_VER}[X,opengl] sys-libs/zlib $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] @@ -101,10 +102,7 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON - # wxWidgets does not support runtime selection of backends (GLX vs EGL), - # if enabled it can break KiCad depending on what wxGTK was compiled - # with, see bug #911120 - -DKICAD_USE_EGL=OFF + -DKICAD_USE_EGL=ON -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"