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 AE32A158089 for ; Sun, 12 Nov 2023 04:24:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 854B12BC02A; Sun, 12 Nov 2023 04:24:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E0B22BC02A for ; Sun, 12 Nov 2023 04:24:35 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C05E335D2F for ; Sun, 12 Nov 2023 04:24:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9EF61365 for ; Sun, 12 Nov 2023 04:24:32 +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: <1699761876.acc988b13bfeb7aa26ebf9563137afb673791954.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-9999.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: acc988b13bfeb7aa26ebf9563137afb673791954 X-VCS-Branch: master Date: Sun, 12 Nov 2023 04:24:32 +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: 2d058d11-ce5b-4acf-8a73-2cd1cfb5d168 X-Archives-Hash: 4b56a1534b5e2b1892c5f1da93879bf6 commit: acc988b13bfeb7aa26ebf9563137afb673791954 Author: Zoltan Puskas sinustrom info> AuthorDate: Sun Nov 5 09:22:47 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 12 04:04:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc988b1 sci-electronics/kicad: Fix up 9999 Bug #911120 haunts us so this change forces the latest wxGTK for kicad-9999 ebuilds too. This brings the ebuild almost in sync with the latest release, except for the new libgit2 dependency. Signed-off-by: Zoltan Puskas sinustrom.info> Closes: https://github.com/gentoo/gentoo/pull/33676 Signed-off-by: Sam James gentoo.org> sci-electronics/kicad/kicad-9999.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 54a4f7a1ffb8..93ae9f0c2274 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.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] @@ -47,9 +48,9 @@ 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] >sci-electronics/ngspice-27[shared] sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] @@ -100,9 +101,6 @@ 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_BUILD_I18N="$(usex nls)"