commit:     e3371a44d2e12d79c8177d58bc7ec4d0ba3b5cc9
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Fri Aug  4 05:45:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 05:11:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3371a44

sci-electronics/kicad: Fix build failure with GLX enabled wxGTK

Closes: https://bugs.gentoo.org/911120
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/32055
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-electronics/kicad/{kicad-7.0.1.ebuild => kicad-7.0.1-r1.ebuild}  | 5 ++++-
 sci-electronics/kicad/{kicad-7.0.2.ebuild => kicad-7.0.2-r1.ebuild}  | 5 ++++-
 .../kicad/{kicad-7.0.6-r1.ebuild => kicad-7.0.6-r2.ebuild}           | 5 ++++-
 sci-electronics/kicad/kicad-9999.ebuild                              | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sci-electronics/kicad/kicad-7.0.1.ebuild 
b/sci-electronics/kicad/kicad-7.0.1-r1.ebuild
similarity index 95%
rename from sci-electronics/kicad/kicad-7.0.1.ebuild
rename to sci-electronics/kicad/kicad-7.0.1-r1.ebuild
index 9dbca5bca8c5..180b6e88f864 100644
--- a/sci-electronics/kicad/kicad-7.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.1-r1.ebuild
@@ -101,7 +101,10 @@ src_configure() {
                -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
                -DKICAD_SCRIPTING_WXPYTHON=ON
-               -DKICAD_USE_EGL=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)"
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"

diff --git a/sci-electronics/kicad/kicad-7.0.2.ebuild 
b/sci-electronics/kicad/kicad-7.0.2-r1.ebuild
similarity index 95%
rename from sci-electronics/kicad/kicad-7.0.2.ebuild
rename to sci-electronics/kicad/kicad-7.0.2-r1.ebuild
index c58a6623fced..899d0d74f13b 100644
--- a/sci-electronics/kicad/kicad-7.0.2.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.2-r1.ebuild
@@ -101,7 +101,10 @@ src_configure() {
                -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
                -DKICAD_SCRIPTING_WXPYTHON=ON
-               -DKICAD_USE_EGL=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)"
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"

diff --git a/sci-electronics/kicad/kicad-7.0.6-r1.ebuild 
b/sci-electronics/kicad/kicad-7.0.6-r2.ebuild
similarity index 95%
rename from sci-electronics/kicad/kicad-7.0.6-r1.ebuild
rename to sci-electronics/kicad/kicad-7.0.6-r2.ebuild
index 7cfafda8dab1..a8534692f833 100644
--- a/sci-electronics/kicad/kicad-7.0.6-r1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.6-r2.ebuild
@@ -99,7 +99,10 @@ src_configure() {
                -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
                -DKICAD_SCRIPTING_WXPYTHON=ON
-               -DKICAD_USE_EGL=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)"
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"

diff --git a/sci-electronics/kicad/kicad-9999.ebuild 
b/sci-electronics/kicad/kicad-9999.ebuild
index 7cfafda8dab1..a8534692f833 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -99,7 +99,10 @@ src_configure() {
                -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
                -DKICAD_SCRIPTING_WXPYTHON=ON
-               -DKICAD_USE_EGL=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)"
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"

Reply via email to