cad/klayout: Update to 0.28.2

cad/klayout/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	klayout
-PORTVERSION=	0.27.9
+PORTVERSION=	0.28.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 
@@ -38,7 +38,6 @@ do-configure:
 	cd ${WRKSRC} && \
 	    ${SETENV} ${MAKE_ENV} ${SH} build.sh \
 		-with-qtbinding \
-		-qt5 \
 		-rpath "${PREFIX}/lib/klayout" \
 		-prefix "${PREFIX}" \
 		-python ${PYTHON_CMD} \

cad/klayout/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1651843460
-SHA256 (KLayout-klayout-v0.27.9_GH0.tar.gz) = e51fffb0df0f3756d395ae1a9ecc5211dec703bb3187861874177fd3d01218ec
-SIZE (KLayout-klayout-v0.27.9_GH0.tar.gz) = 57400341
+TIMESTAMP = 1672646439
+SHA256 (KLayout-klayout-v0.28.2_GH0.tar.gz) = 07244dcaa37f85e3098fa141d84d61a2cbc968a085cb160a9c90128ff8104568
+SIZE (KLayout-klayout-v0.28.2_GH0.tar.gz) = 62443267

cad/klayout/files/patch-build.sh

@@ -1,6 +1,6 @@
---- build.sh.orig	2021-07-23 08:00:26 UTC
+--- build.sh.orig	2022-12-22 22:17:08 UTC
 +++ build.sh
-@@ -576,7 +576,7 @@ echo "    Build directory: $BUILD"
+@@ -583,7 +583,7 @@ echo "      RPATH=$RPATH"
  mkdir -p $BUILD
 
  # source the version script
@@ -9,7 +9,7 @@
 
  # qmake needs absolute paths, so we get them now:
  #   OSX does not have `readlink -f` command. Use equivalent Perl script.
-@@ -589,11 +589,7 @@ else
+@@ -596,11 +596,7 @@ else
  fi
 
  if [ "$IS_MAC" = "no" ]; then
@@ -21,25 +21,11 @@
  else
    MAKE_PRG=make
  fi
-@@ -615,9 +611,9 @@ cd $BUILD
-
- # chose the right qmake
- if [ $HAVE_QT5 = 0 ]; then
--  export QT_SELECT=4
-+  export QT_SELECT=qt4
- else
--  export QT_SELECT=5
-+  export QT_SELECT=qt5
- fi
-
- $QMAKE -v
-@@ -625,82 +621,85 @@ $QMAKE -v
+@@ -625,83 +621,85 @@ $QMAKE -v
  # Force a minimum rebuild because of version info
  touch $CURR_DIR/src/version/version.h
 
 -qmake_options=(
-+# XXX
-+#  CONFIG=\"$CONFIG\"
 +qmake_options="
    -recursive
 -  CONFIG+="$CONFIG"
@@ -62,15 +48,16 @@
 -  HAVE_QT_XML="$HAVE_QT_XML"
 -  HAVE_64BIT_COORD="$HAVE_64BIT_COORD"
 -  HAVE_QT="$HAVE_QT"
--  HAVE_QT5="$HAVE_QT5"
 -  HAVE_CURL="$HAVE_CURL"
 -  HAVE_EXPAT="$HAVE_EXPAT"
+-  HAVE_PNG="$HAVE_PNG"
 -  PREFIX="$BIN"
 -  RPATH="$RPATH"
 -  KLAYOUT_VERSION="$KLAYOUT_VERSION"
 -  KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE"
 -  KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
 -)
++  CONFIG+=\"$CONFIG\"
 +  RUBYLIBFILE=\"$RUBYLIBFILE\"
 +  RUBYVERSIONCODE=\"$RUBYVERSIONCODE\"
 +  HAVE_RUBY=\"$HAVE_RUBY\"
@@ -90,9 +77,9 @@
 +  HAVE_QT_XML=\"$HAVE_QT_XML\"
 +  HAVE_64BIT_COORD=\"$HAVE_64BIT_COORD\"
 +  HAVE_QT=\"$HAVE_QT\"
-+  HAVE_QT5=\"$HAVE_QT5\"
 +  HAVE_CURL=\"$HAVE_CURL\"
 +  HAVE_EXPAT=\"$HAVE_EXPAT\"
++  HAVE_PNG=\"$HAVE_PNG\"
 +  PREFIX=\"$BIN\"
 +  RPATH=\"$RPATH\"
 +  KLAYOUT_VERSION=\"$KLAYOUT_VERSION\"
@@ -131,7 +118,7 @@
 -    QMAKE_LINK="$CXX"
 -    QMAKE_LINK_SHLIB="$CXX"
 -    QMAKE_OBJCOPY="$OBJCOPY"
-+  qmake_options="$qmake_options
++  qmake_options="
 +    QMAKE_AR=\"$AR cqs\"
 +    QMAKE_LINK_C=\"$CC\"
 +    QMAKE_LINK_C_SHLIB=\"$CC\"
@@ -152,7 +139,9 @@
 +    QMAKE_CXXFLAGS=\"$CXXFLAGS\"
      QMAKE_CXXFLAGS_RELEASE=
      QMAKE_CXXFLAGS_DEBUG=
+-    QMAKE_LIBS="$LIBS"
 -    QMAKE_LFLAGS="$LDFLAGS"
++    QMAKE_LIBS=\"$LIBS\"
 +    QMAKE_LFLAGS=\"$LDFLAGS\"
      QMAKE_LFLAGS_RELEASE=
      QMAKE_LFLAGS_DEBUG=
@@ -163,9 +152,9 @@
 -echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
 -$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
 +echo $QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} \
-+  QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
++    QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
 +$QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} \
-+  QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
++    QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
 
  cd $CURR_DIR
  echo ""

cad/klayout/files/patch-src-ant-ant-ant.pro

@@ -1,9 +1,19 @@
---- src/ant/ant/ant.pro.orig	2021-08-28 17:19:48 UTC
+--- src/ant/ant/ant.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/ant/ant/ant.pro
-@@ -37,5 +37,5 @@ SOURCES = \
+@@ -49,14 +49,14 @@ SOURCES += \
 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_db.so
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_db.so
+
+ !equals(HAVE_QT, "0") {
+
+   INCLUDEPATH += $$LAYUI_INC
+   DEPENDPATH += $$LAYUI_INC
+
+-  LIBS += -lklayout_layui
++  LIBS += $$DESTDIR/libklayout_layui.so
+
+ }
 

cad/klayout/files/patch-src-drc-drc-drc.pro

@@ -1,6 +1,6 @@
---- src/drc/drc/drc.pro.orig	2021-08-28 17:01:48 UTC
+--- src/drc/drc/drc.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/drc/drc/drc.pro
-@@ -18,5 +18,5 @@ RESOURCES = \
+@@ -20,5 +20,5 @@ HEADERS = \
 
  INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
  DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC

cad/klayout/files/patch-src-edt-edt-edt.pro

@@ -1,9 +1,19 @@
---- src/edt/edt/edt.pro.orig	2021-08-28 16:59:48 UTC
+--- src/edt/edt/edt.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/edt/edt/edt.pro
-@@ -71,5 +71,5 @@ DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_I
- INCLUDEPATH += $$DESTDIR/laybasic/laybasic
- DEPENDPATH += $$DESTDIR/laybasic/laybasic
+@@ -81,14 +81,14 @@ SOURCES += \
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_db.so
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_db.so
+
+ !equals(HAVE_QT, "0") {
+
+   INCLUDEPATH += $$LAYUI_INC
+   DEPENDPATH += $$LAYUI_INC
+
+-  LIBS += -lklayout_layui
++  LIBS += $$DESTDIR/libklayout_layui.so
+
+ }
 

cad/klayout/files/patch-src-gsi-gsi-gsi.pro

@@ -1,6 +1,6 @@
---- src/gsi/gsi/gsi.pro.orig	2021-08-28 17:25:20 UTC
+--- src/gsi/gsi/gsi.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/gsi/gsi/gsi.pro
-@@ -51,5 +51,5 @@ SOURCES += gsiDeclTl.cc 
+@@ -53,5 +53,5 @@ SOURCES += \
 
  INCLUDEPATH += $$TL_INC
  DEPENDPATH += $$TL_INC

cad/klayout/files/patch-src-img-img-img.pro

@@ -1,9 +1,19 @@
---- src/img/img/img.pro.orig	2021-08-28 16:50:46 UTC
+--- src/img/img/img.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/img/img/img.pro
-@@ -37,5 +37,5 @@ SOURCES = \
+@@ -49,13 +49,13 @@ SOURCES += \
 
- INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_laybasic -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_db.so
+ INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
+ DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
+-
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_db.so
++ 
+ !equals(HAVE_QT, "0") {
 
+   INCLUDEPATH += $$LAYUI_INC
+   DEPENDPATH += $$LAYUI_INC
+
+-  LIBS += -lklayout_layui
++  LIBS += $$DESTDIR/libklayout_layui.so
+
+ }

cad/klayout/files/patch-src-klayout.pri

@@ -1,6 +1,6 @@
---- src/klayout.pri.orig	2021-07-23 08:00:26 UTC
+--- src/klayout.pri.orig	2022-12-22 22:17:08 UTC
 +++ src/klayout.pri
-@@ -100,7 +100,9 @@ equals(HAVE_RUBY, "1") {
+@@ -113,7 +113,9 @@ equals(HAVE_RUBY, "1") {
  }
 
  !isEmpty(RPATH) {

cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro

@@ -1,6 +1,11 @@
---- src/klayout_main/klayout_main/klayout_main.pro.orig	2022-04-24 08:12:38 UTC
+--- src/klayout_main/klayout_main/klayout_main.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/klayout_main/klayout_main/klayout_main.pro
-@@ -27,39 +27,39 @@ DEPENDPATH += $$QTBASIC_INC
+@@ -24,52 +24,52 @@ win32 {
+ INCLUDEPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
+ DEPENDPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
+
+-LIBS += -lklayout_doc -lklayout_icons
++LIBS += $$DESTDIR/libklayout_doc.so $$DESTDIR/libklayout_icons.so
 
  equals(HAVE_QTBINDINGS, "1") {
 
@@ -51,3 +56,15 @@
      }
 
    }
+
+   greaterThan(QT_MAJOR_VERSION, 5) {
+
+-    LIBS += -lklayout_QtCore5Compat
+-    LIBS -= -lklayout_QtXmlPatterns
+-    LIBS -= -lklayout_QtDesigner
++    LIBS += $$DESTDIR/libklayout_QtCore5Compat.so
++    LIBS -= $$DESTDIR/libklayout_QtXmlPatterns.so
++    LIBS -= $$DESTDIR/libklayout_QtDesigner.so
+
+   }
+

cad/klayout/files/patch-src-lay-lay-lay.pro

@@ -1,22 +1,14 @@
---- src/lay/lay/lay.pro.orig	2022-04-24 08:12:38 UTC
+--- src/lay/lay/lay.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/lay/lay/lay.pro
-@@ -181,13 +181,13 @@ RESOURCES = layBuildInMacros.qrc \
-
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_ant.so $$DESTDIR/libklayout_img.so $$DESTDIR/libklayout_edt.so
-
- win32 {
-   # for stack trace support:
-   # lpsapi for GetModuleFileName and others
-   # dbghelp for SymFromAddr and other
--  LIBS += -lpsapi -ldbghelp
-+  LIBS += $$DESTDIR/libpsapi.so $$DESTDIR/libdbghelp.so
- }
-
- *bsd* {
-@@ -203,12 +203,12 @@ INCLUDEPATH += $$QTBASIC_INC
+@@ -182,18 +182,18 @@ RESOURCES = layBuildInMacros.qrc \
+
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_layview -lklayout_layui -lklayout_ant -lklayout_img -lklayout_edt
+-
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_layui.so $$DESTDIR/libklayout_ant.so $$DESTDIR/libklayout_img.so $$DESTDIR/libklayout_edt.so
++ 
+ INCLUDEPATH += $$QTBASIC_INC
  DEPENDPATH += $$QTBASIC_INC
 
  equals(HAVE_QTBINDINGS, "1") {
@@ -32,7 +24,7 @@
    }
  }
 
-@@ -216,16 +216,16 @@ INCLUDEPATH += $$RBA_INC
+@@ -201,16 +201,16 @@ INCLUDEPATH += $$RBA_INC
  DEPENDPATH += $$RBA_INC
 
  equals(HAVE_RUBY, "1") {

cad/klayout/files/patch-src-lay-lay-laySystemPaths.cc

@@ -1,4 +1,4 @@
---- src/lay/lay/laySystemPaths.cc.orig	2021-08-28 18:02:22 UTC
+--- src/lay/lay/laySystemPaths.cc.orig	2022-12-22 22:17:08 UTC
 +++ src/lay/lay/laySystemPaths.cc
 @@ -26,6 +26,8 @@
  #include "tlString.h"
@@ -9,7 +9,7 @@
  #include <QDir>
  #include <QFileInfo>
  #include <QCoreApplication>
-@@ -109,6 +111,7 @@ get_klayout_path ()
+@@ -121,6 +123,7 @@ get_klayout_path ()
      } else {
        klayout_path.push_back (tl::get_inst_path ());
      }

cad/klayout/files/patch-src-lay-unit_tests-unit_tests.pro

@@ -1,9 +1,9 @@
---- src/lay/unit_tests/unit_tests.pro.orig	2021-08-28 17:29:41 UTC
+--- src/lay/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/lay/unit_tests/unit_tests.pro
-@@ -13,5 +13,5 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
- DEPENDPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
+@@ -14,5 +14,5 @@ SOURCES = \
+ INCLUDEPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
+ DEPENDPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
 
--LIBS += -L$$DESTDIR_UT -lklayout_lay -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ant -lklayout_img -lklayout_rdb
+-LIBS += -L$$DESTDIR_UT -lklayout_lay -lklayout_laybasic -lklayout_layui -lklayout_layview -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ant -lklayout_img -lklayout_rdb
 +LIBS += $$DESTDIR_UT/libklayout_lay.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so $$DESTDIR_UT/libklayout_ant.so $$DESTDIR_UT/libklayout_img.so $$DESTDIR_UT/libklayout_rdb.so
 

cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro

@@ -1,12 +1,13 @@
---- src/laybasic/laybasic/laybasic.pro.orig	2022-04-24 08:12:38 UTC
+--- src/laybasic/laybasic/laybasic.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/laybasic/laybasic/laybasic.pro
-@@ -305,15 +305,15 @@ HEADERS = \
-
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so
+@@ -139,15 +139,15 @@ HEADERS += \
 
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb 
+-
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so
++ 
  INCLUDEPATH += $$QTBASIC_INC
  DEPENDPATH += $$QTBASIC_INC
 

cad/klayout/files/patch-src-laybasic-unit_tests-unit_tests.pro

@@ -1,6 +1,6 @@
---- src/laybasic/unit_tests/unit_tests.pro.orig	2021-08-28 16:14:42 UTC
+--- src/laybasic/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/laybasic/unit_tests/unit_tests.pro
-@@ -21,5 +21,5 @@ SOURCES = \
+@@ -19,5 +19,5 @@ SOURCES = \
  INCLUDEPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic
  DEPENDPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic
 

cad/klayout/files/patch-src-lvs-lvs-lvs.pro

@@ -1,6 +1,6 @@
---- src/lvs/lvs/lvs.pro.orig	2021-08-28 16:57:38 UTC
+--- src/lvs/lvs/lvs.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/lvs/lvs/lvs.pro
-@@ -18,5 +18,5 @@ RESOURCES = \
+@@ -20,5 +20,5 @@ HEADERS = \
 
  INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
  DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC

cad/klayout/files/patch-src-lym-lym-lym.pro

@@ -1,6 +1,6 @@
---- src/lym/lym/lym.pro.orig	2021-08-28 16:46:14 UTC
+--- src/lym/lym/lym.pro.orig	2022-12-22 22:17:08 UTC
 +++ src/lym/lym/lym.pro
-@@ -20,22 +20,22 @@ HEADERS = \
+@@ -23,22 +23,22 @@ HEADERS = \
  INCLUDEPATH += $$TL_INC $$GSI_INC
  DEPENDPATH += $$TL_INC $$GSI_INC