From f1535b44d6fda761018ea432a180dcb482e97652 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Nov 2023 10:27:43 +0000 Subject: gentoo auto-resync : 12:11:2023 - 10:27:42 --- sci-electronics/Manifest.gz | Bin 9028 -> 9026 bytes sci-electronics/kicad/Manifest | 2 +- sci-electronics/kicad/kicad-9999.ebuild | 6 ++---- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sci-electronics') diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz index 01e1c6914513..48732432064e 100644 Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 62a23d141be6..f57b70dc7f9b 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -5,5 +5,5 @@ DIST kicad-7.0.8.tar.bz2 43996328 BLAKE2B 929781f06c7ef9eac16fc1f7c89c07e481f04f EBUILD kicad-7.0.1.ebuild 4233 BLAKE2B c95b3aa60006a6e7d8f5c007efeb69f348edcf4b34e5c11029604dca80463172712a82fa109a303bd42bd831010d765fa1245f1fc40d503de4b50d5f4f58c7c1 SHA512 5f3a9cb2f4e9d0a48f42d6bcc1050f10776c05c09ee2c8cdc983a756659beb7551a3d71a1adc51beff533c237c5b74fe7af4cfee6e93033db0f95c5c590c2a6a EBUILD kicad-7.0.7.ebuild 4175 BLAKE2B f900f87db400859021a145644a9e31e134fa77f25d49c8a901c7d93684af8d8873f5fb58040ffe075a902a4463eb801d8c9af118d4993348a4aefc4168ae9b68 SHA512 cdaa4208bb1b4b135e340d9587f8af3222312e87b4a8281c1fe454073d889cc6615a6f6837ead0bb8280192863a2339934e37deca96cacd2e0ee9be7fc9e5bde EBUILD kicad-7.0.8.ebuild 4176 BLAKE2B d0fb5c9a2c445fe056dd46ca9c11de274c44a6169cca3b0bb115c218b122b6bf43b49f9c05ad7565a1058b7a47b64bf23c9150f7caef7c724a6b6be3873874bf SHA512 12526591febb7c328252ab32b2b3520540db0fa0fc7bd1bd42d2476eb2c0e12d9fe2420fdca9d350c464deaded48c8798f926b882cc862068ac2a774b6b4e6c6 -EBUILD kicad-9999.ebuild 4267 BLAKE2B 59f512b1299aac4682a617c331f15bc0920aafe2b2a8e687a0cbe0d89a87d9fea8b3a94524dc03f24d4a551fc04c21744315f91d0cacdf2946b80be98ed80f48 SHA512 3738fa8d25f1a6481027e3f4064588d5254de36779f5a85eacb828554d68f307fa780eeb9df9c32cd37ed1a71ef8a18fd5a155282a38d131391712672a540460 +EBUILD kicad-9999.ebuild 4194 BLAKE2B 7bcb905319492da4e889eab3fb468a0fdd10bba6c53ccbd71c962978b67c061c55baae4616ffa68f69443c3a455e12c87ae1617fac9bec492e59613a76979274 SHA512 4353774707909fbcb2d2517e29cbb78c2375c3805d061adb5f3a6a7ae87b635ddf43d4197ac92608f7c8ad0aa18b293ee0d35d190f82ee7f5f2cbe948c4ecd9a MISC metadata.xml 765 BLAKE2B ca4295c6a975ed0161e0e19d6faffa585001c65bb1b6c53659d63c22e10aa1856840752182e3f9108b11b582105691f6d03f3a63ee52fd5ea875b6ba3049e379 SHA512 4af8f8ba855e6c5dfc6e4f34ba1efb0705fb92dffb9fcc6196457a43ebca11da4b1fa752a6bba02ce3bbb7bfbbeeb5a5f8cedfb055378d67f622014ba3240768 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)" -- cgit v1.2.3