From 5e823337b3cdc1aba41badecc4a36a015136c08d Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 8 Nov 2025 09:56:59 +0100
Subject: [PATCH] Trying to fix builds

---
 src/plugins/streamers/lstream/lstream.pri     |  3 --
 .../streamers/lstream/runtime/capnp/capnp.pri | 22 ++++++------
 .../streamers/lstream/runtime/capnp/capnp.pro |  1 -
 .../runtime/capnp/capnp/{any.c++ => any.cc}   |  0
 .../capnp/capnp/{arena.c++ => arena.cc}       |  0
 .../runtime/capnp/capnp/{blob.c++ => blob.cc} |  0
 .../capnp/{c++.capnp.c++ => c++.capnp.cc}     |  0
 .../capnp/capnp/{layout.c++ => layout.cc}     |  0
 .../runtime/capnp/capnp/{list.c++ => list.cc} |  0
 .../capnp/capnp/{message.c++ => message.cc}   |  0
 .../{schema.capnp.c++ => schema.capnp.cc}     |  0
 ...rialize-packed.c++ => serialize-packed.cc} |  0
 .../capnp/{serialize.c++ => serialize.cc}     |  0
 .../{stream.capnp.c++ => stream.capnp.cc}     |  0
 .../streamers/lstream/runtime/fetch.sh        | 12 ++++---
 .../streamers/lstream/runtime/kj/kj.pri       | 36 +++++++++----------
 .../streamers/lstream/runtime/kj/kj.pro       |  1 -
 .../runtime/kj/kj/{arena.c++ => arena.cc}     |  0
 .../runtime/kj/kj/{array.c++ => array.cc}     |  0
 .../runtime/kj/kj/{cidr.c++ => cidr.cc}       |  0
 .../runtime/kj/kj/{common.c++ => common.cc}   |  0
 .../runtime/kj/kj/{debug.c++ => debug.cc}     |  0
 .../kj/kj/{encoding.c++ => encoding.cc}       |  0
 .../kj/kj/{exception.c++ => exception.cc}     |  0
 .../runtime/kj/kj/{hash.c++ => hash.cc}       |  0
 .../lstream/runtime/kj/kj/{io.c++ => io.cc}   |  0
 .../runtime/kj/kj/{list.c++ => list.cc}       |  0
 .../runtime/kj/kj/{main.c++ => main.cc}       |  0
 .../runtime/kj/kj/{memory.c++ => memory.cc}   |  0
 .../runtime/kj/kj/{mutex.c++ => mutex.cc}     |  0
 ...source-location.c++ => source-location.cc} |  0
 .../runtime/kj/kj/{string.c++ => string.cc}   |  0
 .../runtime/kj/kj/{table.c++ => table.cc}     |  0
 .../runtime/kj/kj/{thread.c++ => thread.cc}   |  0
 .../runtime/kj/kj/{units.c++ => units.cc}     |  0
 35 files changed, 37 insertions(+), 38 deletions(-)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{any.c++ => any.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{arena.c++ => arena.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{blob.c++ => blob.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{c++.capnp.c++ => c++.capnp.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{layout.c++ => layout.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{list.c++ => list.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{message.c++ => message.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{schema.capnp.c++ => schema.capnp.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{serialize-packed.c++ => serialize-packed.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{serialize.c++ => serialize.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/capnp/capnp/{stream.capnp.c++ => stream.capnp.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{arena.c++ => arena.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{array.c++ => array.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{cidr.c++ => cidr.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{common.c++ => common.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{debug.c++ => debug.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{encoding.c++ => encoding.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{exception.c++ => exception.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{hash.c++ => hash.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{io.c++ => io.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{list.c++ => list.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{main.c++ => main.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{memory.c++ => memory.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{mutex.c++ => mutex.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{source-location.c++ => source-location.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{string.c++ => string.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{table.c++ => table.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{thread.c++ => thread.cc} (100%)
 rename src/plugins/streamers/lstream/runtime/kj/kj/{units.c++ => units.cc} (100%)

diff --git a/src/plugins/streamers/lstream/lstream.pri b/src/plugins/streamers/lstream/lstream.pri
index 5bf1b1078..6bca65188 100644
--- a/src/plugins/streamers/lstream/lstream.pri
+++ b/src/plugins/streamers/lstream/lstream.pri
@@ -1,7 +1,4 @@
 
-# .c++ is not a standard C++ extension in qmake
-QMAKE_EXT_CPP += .c++
-
 # capnp needs C++ 14 in version 1.0.1
 # Qt6 comes with C++ 17 requirement.
 equals(HAVE_QT, "0") || lessThan(QT_MAJOR_VERSION, 6) {
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp.pri b/src/plugins/streamers/lstream/runtime/capnp/capnp.pri
index 39bd61f50..6fc715985 100644
--- a/src/plugins/streamers/lstream/runtime/capnp/capnp.pri
+++ b/src/plugins/streamers/lstream/runtime/capnp/capnp.pri
@@ -1,16 +1,16 @@
 
 CAPNP_SOURCES=\
-  capnp/c++.capnp.c++ \
-  capnp/blob.c++ \
-  capnp/arena.c++ \
-  capnp/layout.c++ \
-  capnp/list.c++ \
-  capnp/any.c++ \
-  capnp/message.c++ \
-  capnp/schema.capnp.c++ \
-  capnp/stream.capnp.c++ \
-  capnp/serialize.c++ \
-  capnp/serialize-packed.c++ \
+  capnp/c++.capnp.cc \
+  capnp/blob.cc \
+  capnp/arena.cc \
+  capnp/layout.cc \
+  capnp/list.cc \
+  capnp/any.cc \
+  capnp/message.cc \
+  capnp/schema.capnp.cc \
+  capnp/stream.capnp.cc \
+  capnp/serialize.cc \
+  capnp/serialize-packed.cc \
 
 CAPNP_HEADERS=\
   capnp/arena.h \
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
index ccb8b23a2..23d723e3b 100644
--- a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
+++ b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
@@ -2,7 +2,6 @@
 TEMPLATE = lib
 DESTDIR = $$OUT_PWD/../../../../..
 
-include($$PWD/../../lstream.pri)
 include($$PWD/capnp.pri)
 
 TARGET = xcapnp
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/any.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/any.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/any.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/any.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/arena.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/arena.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/arena.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/arena.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/blob.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/blob.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/blob.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/blob.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/c++.capnp.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/c++.capnp.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/c++.capnp.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/c++.capnp.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/layout.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/layout.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/layout.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/layout.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/list.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/list.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/list.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/list.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/message.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/message.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/message.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/message.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/schema.capnp.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/schema.capnp.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/schema.capnp.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/schema.capnp.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/serialize-packed.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/serialize-packed.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/serialize-packed.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/serialize-packed.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/serialize.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/serialize.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/serialize.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/serialize.cc
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp/stream.capnp.c++ b/src/plugins/streamers/lstream/runtime/capnp/capnp/stream.capnp.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/capnp/capnp/stream.capnp.c++
rename to src/plugins/streamers/lstream/runtime/capnp/capnp/stream.capnp.cc
diff --git a/src/plugins/streamers/lstream/runtime/fetch.sh b/src/plugins/streamers/lstream/runtime/fetch.sh
index 11c8426e8..4fd9fe35f 100755
--- a/src/plugins/streamers/lstream/runtime/fetch.sh
+++ b/src/plugins/streamers/lstream/runtime/fetch.sh
@@ -140,7 +140,8 @@ kj_std_headers=(
 )
 
 for f in ${capnp_sources_lite[@]}; do
-  cp $tmp/c++/src/capnp/$f capnp/capnp
+  ftarget=${f/.c++/.cc}
+  cp $tmp/c++/src/capnp/$f capnp/capnp/$ftarget
 done
 for f in ${capnp_headers[@]}; do
   cp $tmp/c++/src/capnp/$f capnp/capnp
@@ -153,7 +154,8 @@ pri=capnp/capnp.pri
 echo "" >$pri
 echo "CAPNP_SOURCES=\\" >>$pri
 for f in ${capnp_sources_lite[@]}; do
-  echo "  capnp/$f \\" >>$pri
+  ftarget=${f/.c++/.cc}
+  echo "  capnp/$ftarget \\" >>$pri
 done
 echo "" >>$pri
 echo "CAPNP_HEADERS=\\" >>$pri
@@ -165,7 +167,8 @@ for f in ${capnp_compat_headers[@]}; do
 done
 
 for f in ${kj_sources_lite[@]}; do
-  cp $tmp/c++/src/kj/$f kj/kj
+  ftarget=${f/.c++/.cc}
+  cp $tmp/c++/src/kj/$f kj/kj/$ftarget
 done
 for f in ${kj_headers[@]}; do
   cp $tmp/c++/src/kj/$f kj/kj
@@ -181,7 +184,8 @@ pri=kj/kj.pri
 echo "" >$pri
 echo "KJ_SOURCES=\\" >>$pri
 for f in ${kj_sources_lite[@]}; do
-  echo "  kj/$f \\" >>$pri
+  ftarget=${f/.c++/.cc}
+  echo "  kj/$ftarget \\" >>$pri
 done
 echo "" >>$pri
 echo "KJ_HEADERS=\\" >>$pri
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj.pri b/src/plugins/streamers/lstream/runtime/kj/kj.pri
index 533816eee..844719f98 100644
--- a/src/plugins/streamers/lstream/runtime/kj/kj.pri
+++ b/src/plugins/streamers/lstream/runtime/kj/kj.pri
@@ -1,23 +1,23 @@
 
 KJ_SOURCES=\
-  kj/array.c++ \
-  kj/cidr.c++ \
-  kj/list.c++ \
-  kj/common.c++ \
-  kj/debug.c++ \
-  kj/exception.c++ \
-  kj/io.c++ \
-  kj/memory.c++ \
-  kj/mutex.c++ \
-  kj/string.c++ \
-  kj/source-location.c++ \
-  kj/hash.c++ \
-  kj/table.c++ \
-  kj/thread.c++ \
-  kj/main.c++ \
-  kj/arena.c++ \
-  kj/units.c++ \
-  kj/encoding.c++ \
+  kj/array.cc \
+  kj/cidr.cc \
+  kj/list.cc \
+  kj/common.cc \
+  kj/debug.cc \
+  kj/exception.cc \
+  kj/io.cc \
+  kj/memory.cc \
+  kj/mutex.cc \
+  kj/string.cc \
+  kj/source-location.cc \
+  kj/hash.cc \
+  kj/table.cc \
+  kj/thread.cc \
+  kj/main.cc \
+  kj/arena.cc \
+  kj/units.cc \
+  kj/encoding.cc \
 
 KJ_HEADERS=\
   kj/cidr.h \
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj.pro b/src/plugins/streamers/lstream/runtime/kj/kj.pro
index ad213c421..28a97585c 100644
--- a/src/plugins/streamers/lstream/runtime/kj/kj.pro
+++ b/src/plugins/streamers/lstream/runtime/kj/kj.pro
@@ -2,7 +2,6 @@
 TEMPLATE = lib
 DESTDIR = $$OUT_PWD/../../../../..
 
-include($$PWD/../../lstream.pri)
 include($$PWD/kj.pri)
 
 TARGET = xkj
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/arena.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/arena.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/arena.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/arena.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/array.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/array.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/array.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/array.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/cidr.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/cidr.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/cidr.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/cidr.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/common.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/common.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/common.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/common.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/debug.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/debug.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/debug.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/debug.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/encoding.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/encoding.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/encoding.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/encoding.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/exception.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/exception.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/exception.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/exception.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/hash.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/hash.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/hash.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/hash.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/io.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/io.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/io.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/io.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/list.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/list.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/list.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/list.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/main.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/main.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/main.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/main.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/memory.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/memory.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/memory.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/memory.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/mutex.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/mutex.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/mutex.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/mutex.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/source-location.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/source-location.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/source-location.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/source-location.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/string.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/string.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/string.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/string.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/table.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/table.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/table.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/table.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/thread.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/thread.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/thread.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/thread.cc
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj/units.c++ b/src/plugins/streamers/lstream/runtime/kj/kj/units.cc
similarity index 100%
rename from src/plugins/streamers/lstream/runtime/kj/kj/units.c++
rename to src/plugins/streamers/lstream/runtime/kj/kj/units.cc