From fdfabea6c8631fcbed20ace2dd9ddb87b31c1db5 Mon Sep 17 00:00:00 2001
From: Istvan Matejcsok <119620946+matejcsok-ee@users.noreply.github.com>
Date: Mon, 22 Jun 2026 12:17:01 +0200
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A7=20fork-cleanup=20tooling?=
 =?UTF-8?q?=20+=20bump=20kicad=20submodule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- kicad → a2c634f2: drop redundant wasm guards, restore upstream
  (modified upstream files 95→86, churn 3180→3104)
- kicad-diff-stats.sh: fix fork-point detection (add missing commit authors
  + an @emergence-engineering.com domain net) so it reports the real
  divergence instead of 0
- build-kicad-target.sh: drop dead -DKICAD_PCM and -DBUILD_GITHUB_PLUGIN
  flags (not options in this KiCad version); keep -DKICAD_SPICE=OFF, which is
  read by wasm/cmake/Findngspice.cmake

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 kicad                               |  2 +-
 scripts/kicad-diff-stats.sh         | 25 ++++++++++++++++++++++++-
 scripts/kicad/build-kicad-target.sh |  3 ---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/kicad b/kicad
index c77a4af..a2c634f 160000
--- a/kicad
+++ b/kicad
@@ -1 +1 @@
-Subproject commit c77a4aff28cc4710f773bf0284c8ad2e4732895a
+Subproject commit a2c634f2f5f061ce13dc09fae3801c618f2a9f81
diff --git a/scripts/kicad-diff-stats.sh b/scripts/kicad-diff-stats.sh
index c32f038..b55f6a6 100755
--- a/scripts/kicad-diff-stats.sh
+++ b/scripts/kicad-diff-stats.sh
@@ -20,12 +20,27 @@ mkdir -p "$LOGS_DIR"
 TIMESTAMP="$(date +%Y%m%d-%H%M%S)"
 LOG_FILE="$LOGS_DIR/${TIMESTAMP}.log"
 
-# Our commit authors (add more if needed)
+# Our commit authors (add more if needed).
+# NOTE: every author whose commits land on top of the upstream base must be
+# listed here (or be matched by OUR_DOMAINS below). If one is missing, the
+# upstream-base detection loop stops early on that author's commit and the
+# divergence is drastically under-counted.
 OUR_AUTHORS=(
     "viktor.vaczi@emergence-engineering.com"
+    "balint.ipkovich@emergence-engineering.com"
+    "torcsvari.gergo@gmail.com"
+    "119620946+matejcsok-ee@users.noreply.github.com"
     "noreply@anthropic.com"
 )
 
+# Any commit whose author email ends with one of these domains is treated as
+# ours too — a safety net so new emergence contributors don't silently break
+# the count. Contributors using gmail/github-noreply addresses must still be
+# listed explicitly in OUR_AUTHORS above.
+OUR_DOMAINS=(
+    "@emergence-engineering.com"
+)
+
 echo "=== KiCad Fork Diff Statistics ===" | tee "$LOG_FILE"
 echo "Generated: $(date)" | tee -a "$LOG_FILE"
 echo "" | tee -a "$LOG_FILE"
@@ -54,6 +69,14 @@ while read -r commit_hash author_email; do
             break
         fi
     done
+    if [ "$is_ours" = false ]; then
+        for our_domain in "${OUR_DOMAINS[@]}"; do
+            if [[ "$author_email" == *"$our_domain" ]]; then
+                is_ours=true
+                break
+            fi
+        done
+    fi
     if [ "$is_ours" = false ]; then
         UPSTREAM_COMMIT="$commit_hash"
         UPSTREAM_AUTHOR="$author_email"
diff --git a/scripts/kicad/build-kicad-target.sh b/scripts/kicad/build-kicad-target.sh
index 75fd3ad..b5d132e 100755
--- a/scripts/kicad/build-kicad-target.sh
+++ b/scripts/kicad/build-kicad-target.sh
@@ -451,9 +451,6 @@ emcmake cmake "${KICAD_DIR}" \
     -DODBC_LINK_FLAGS:STRING="" \
     -DODBC_LIBRARIES:STRING="" \
     \
-    -DBUILD_GITHUB_PLUGIN=OFF \
-    -DKICAD_PCM=OFF \
-    \
     -DHAVE_STRCASECMP=1 \
     -DHAVE_STRNCASECMP=1