repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
"Yixun Lan" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1787096136.436e08e56d5b3f71e7730619762ff0afd5ea12b4.dlan@gentoo> |
commit: 436e08e56d5b3f71e7730619762ff0afd5ea12b4
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Aug 13 04:00:21 2026 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 23:35:36 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436e08e5
sci-electronics/kicad: fix qa_gerbview link with mold
qa_gerbview misses markdown_lib and 3d-viewer, the link fails when the
linker extracts pcb_text.cpp.o or pcbnew_settings.cpp.o from
libpcbcommon.a, seen with mold and USE=test.
Closes: https://bugs.gentoo.org/980747
Merges: https://codeberg.org/gentoo/gentoo/pulls/1662
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/kicad-10.0.0-qa-gerbview-underlink.patch | 27 ++++++++++++++++++++++
.../files/kicad-9.0.9-qa-gerbview-underlink.patch | 27 ++++++++++++++++++++++
sci-electronics/kicad/kicad-10.0.0-r1.ebuild | 1 +
sci-electronics/kicad/kicad-10.0.3.ebuild | 1 +
sci-electronics/kicad/kicad-10.0.5.ebuild | 1 +
sci-electronics/kicad/kicad-9.0.9-r1.ebuild | 1 +
sci-electronics/kicad/kicad-9999.ebuild | 1 +
7 files changed, 59 insertions(+)
diff --git a/sci-electronics/kicad/files/kicad-10.0.0-qa-gerbview-underlink.patch b/sci-electronics/kicad/files/kicad-10.0.0-qa-gerbview-underlink.patch
new file mode 100644
index 000000000000..b0c9a62da796
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-10.0.0-qa-gerbview-underlink.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/980747
+https://gitlab.com/kicad/code/kicad/-/merge_requests/2753
+
+pcbcommon uses ConvertMarkdown2Html from markdown_lib, declare the
+dependency PUBLIC. qa_gerbview also needs the EDA_3D_VIEWER_SETTINGS
+typeinfo from 3d-viewer.
+
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -1155,6 +1155,7 @@ target_link_libraries( pcbcommon PUBLIC
+ delaunator
+ kimath
+ kiplatform
++ markdown_lib
+ nanoflann
+ zint
+ )
+--- a/qa/tests/gerbview/CMakeLists.txt
++++ b/qa/tests/gerbview/CMakeLists.txt
+@@ -63,6 +63,7 @@ add_dependencies( qa_gerbview gerbview )
+ target_link_libraries( qa_gerbview
+ gerbview_kiface_objects
+ pcbcommon
++ 3d-viewer
+ gal
+ common
+ gal
diff --git a/sci-electronics/kicad/files/kicad-9.0.9-qa-gerbview-underlink.patch b/sci-electronics/kicad/files/kicad-9.0.9-qa-gerbview-underlink.patch
new file mode 100644
index 000000000000..495a4d58fc47
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-9.0.9-qa-gerbview-underlink.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/980747
+https://gitlab.com/kicad/code/kicad/-/merge_requests/2753
+
+pcbcommon uses ConvertMarkdown2Html from markdown_lib, declare the
+dependency PUBLIC. qa_gerbview also needs the EDA_3D_VIEWER_SETTINGS
+typeinfo from 3d-viewer.
+
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -870,6 +870,7 @@
+ delaunator
+ kimath
+ kiplatform
++ markdown_lib
+ )
+
+ message( STATUS "Including 3Dconnexion SpaceMouse navigation support in pcbcommon" )
+--- a/qa/tests/gerbview/CMakeLists.txt
++++ b/qa/tests/gerbview/CMakeLists.txt
+@@ -62,6 +62,7 @@
+ target_link_libraries( qa_gerbview
+ gerbview_kiface_objects
+ pcbcommon
++ 3d-viewer
+ gal
+ common
+ gal
diff --git a/sci-electronics/kicad/kicad-10.0.0-r1.ebuild b/sci-electronics/kicad/kicad-10.0.0-r1.ebuild
index a40dcb00ee16..0c78f8830b19 100644
--- a/sci-electronics/kicad/kicad-10.0.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-10.0.0-r1.ebuild
@@ -125,6 +125,7 @@ src_unpack() {
PATCHES=(
"${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924
+ "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747
)
src_prepare() {
diff --git a/sci-electronics/kicad/kicad-10.0.3.ebuild b/sci-electronics/kicad/kicad-10.0.3.ebuild
index 919fc1cd7230..1fe1eea39aac 100644
--- a/sci-electronics/kicad/kicad-10.0.3.ebuild
+++ b/sci-electronics/kicad/kicad-10.0.3.ebuild
@@ -126,6 +126,7 @@ src_unpack() {
PATCHES=(
"${FILESDIR}"/${PN}-10.0.0-fix-cmake4-compat.patch # Bug 970924
+ "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747
)
src_prepare() {
diff --git a/sci-electronics/kicad/kicad-10.0.5.ebuild b/sci-electronics/kicad/kicad-10.0.5.ebuild
index dd89c031f6ed..9a78497bc301 100644
--- a/sci-electronics/kicad/kicad-10.0.5.ebuild
+++ b/sci-electronics/kicad/kicad-10.0.5.ebuild
@@ -126,6 +126,7 @@ src_unpack() {
PATCHES=(
"${FILESDIR}"/${PN}-10.0.0-fix-cmake4-compat.patch # Bug 970924
+ "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747
)
src_prepare() {
diff --git a/sci-electronics/kicad/kicad-9.0.9-r1.ebuild b/sci-electronics/kicad/kicad-9.0.9-r1.ebuild
index 27b13e74c309..b369b813b505 100644
--- a/sci-electronics/kicad/kicad-9.0.9-r1.ebuild
+++ b/sci-electronics/kicad/kicad-9.0.9-r1.ebuild
@@ -123,6 +123,7 @@ src_unpack() {
PATCHES=(
"${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924
"${FILESDIR}"/${P}-gcc16-bitmap2component-link.patch
+ "${FILESDIR}"/${PN}-9.0.9-qa-gerbview-underlink.patch # Bug 980747
)
src_prepare() {
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index dd89c031f6ed..9a78497bc301 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -126,6 +126,7 @@ src_unpack() {
PATCHES=(
"${FILESDIR}"/${PN}-10.0.0-fix-cmake4-compat.patch # Bug 970924
+ "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747
)
src_prepare() {