Trying to fix builds

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) {

src/plugins/streamers/lstream/runtime/capnp/capnp.pri

@@ -1,16 +1,16 @@
 
 CAPNP_SOURCES=\
-  capnp/c++.capnp.c++ \
+  capnp/c++.capnp.cc \
-  capnp/blob.c++ \
+  capnp/blob.cc \
-  capnp/arena.c++ \
+  capnp/arena.cc \
-  capnp/layout.c++ \
+  capnp/layout.cc \
-  capnp/list.c++ \
+  capnp/list.cc \
-  capnp/any.c++ \
+  capnp/any.cc \
-  capnp/message.c++ \
+  capnp/message.cc \
-  capnp/schema.capnp.c++ \
+  capnp/schema.capnp.cc \
-  capnp/stream.capnp.c++ \
+  capnp/stream.capnp.cc \
-  capnp/serialize.c++ \
+  capnp/serialize.cc \
-  capnp/serialize-packed.c++ \
+  capnp/serialize-packed.cc \
 
 CAPNP_HEADERS=\
   capnp/arena.h \

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

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

src/plugins/streamers/lstream/runtime/kj/kj.pri

@@ -1,23 +1,23 @@
 
 KJ_SOURCES=\
-  kj/array.c++ \
+  kj/array.cc \
-  kj/cidr.c++ \
+  kj/cidr.cc \
-  kj/list.c++ \
+  kj/list.cc \
-  kj/common.c++ \
+  kj/common.cc \
-  kj/debug.c++ \
+  kj/debug.cc \
-  kj/exception.c++ \
+  kj/exception.cc \
-  kj/io.c++ \
+  kj/io.cc \
-  kj/memory.c++ \
+  kj/memory.cc \
-  kj/mutex.c++ \
+  kj/mutex.cc \
-  kj/string.c++ \
+  kj/string.cc \
-  kj/source-location.c++ \
+  kj/source-location.cc \
-  kj/hash.c++ \
+  kj/hash.cc \
-  kj/table.c++ \
+  kj/table.cc \
-  kj/thread.c++ \
+  kj/thread.cc \
-  kj/main.c++ \
+  kj/main.cc \
-  kj/arena.c++ \
+  kj/arena.cc \
-  kj/units.c++ \
+  kj/units.cc \
-  kj/encoding.c++ \
+  kj/encoding.cc \
 
 KJ_HEADERS=\
   kj/cidr.h \

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