Merge branch 'master' into pymod

scripts/makedeb.sh

@@ -89,10 +89,15 @@ cd ..
 mkdir -p makedeb-tmp/${sharedir}/doc/klayout
 mkdir -p makedeb-tmp/${sharedir}/applications
 mkdir -p makedeb-tmp/${sharedir}/pixmaps
+<<<<<<< HEAD
 mkdir -p makedeb-tmp/${libdir}/db_plugins
 mkdir -p makedeb-tmp/${libdir}/lay_plugins
 mkdir -p makedeb-tmp/${pylibdir}
 mkdir -p makedeb-tmp/${bindir}
+=======
+mkdir -p makedeb-tmp/${bindir}
+mkdir -p makedeb-tmp/${libdir}
+>>>>>>> master
 
 cp etc/klayout.desktop makedeb-tmp/${sharedir}/applications
 cp etc/logo.png makedeb-tmp/${sharedir}/pixmaps
@@ -103,10 +108,13 @@ cp COPYRIGHT makedeb-tmp/${sharedir}/doc/klayout/copyright
 cp -pd $bininstdir/strm* makedeb-tmp/${bindir}
 cp -pd $bininstdir/klayout makedeb-tmp/${bindir}
 cp -pd $bininstdir/lib*so* makedeb-tmp/${libdir}
+<<<<<<< HEAD
 cp -pd $bininstdir/db_plugins/lib*so* makedeb-tmp/${libdir}/db_plugins
 cp -pd $bininstdir/lay_plugins/lib*so* makedeb-tmp/${libdir}/lay_plugins
 cp -pd $bininstdir/pymod/klayout/*so makedeb-tmp/${pylibdir}
 cp -pd $bininstdir/pymod/klayout/*py makedeb-tmp/${pylibdir}
+=======
+>>>>>>> master
 
 cd makedeb-tmp
 
@@ -131,9 +139,12 @@ echo "Modifying control file .."
 
 strip ${bindir}/*
 strip ${libdir}/*.so*
+<<<<<<< HEAD
 strip ${pylibdir}/*.so
 strip ${libdir}/db_plugins/*.so*
 strip ${libdir}/lay_plugins/*.so*
+=======
+>>>>>>> master
 
 size=`du -ck usr | grep total | sed "s/ *total//"`
 

scripts/mkqtdecl5/mkqtdecl.conf

@@ -864,10 +864,10 @@ no_imports "QAbstractXmlNodeModel"  # base class is QSharedData which is not ava
 # QtNetwork
 
 drop_method "QUrlInfo", /QUrlInfo::QUrlInfo\(.*permissions/ # too many arguments (13)
-drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*quint8\s*\*/ # requires char *, a string version is available for IPv6
+drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*const\s+QIPv6Address/ # requires QIPv6Address struct, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*const\s+sockaddr/ # requires sockaddr struct, a string version is available for IPv6
-drop_method "QHostAddress", /QHostAddress::setAddress\(\s*quint8\s*\*/ # requires char *, a string version is available for IPv6
+drop_method "QHostAddress", /QHostAddress::setAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::setAddress\(\s*const\s+QIPv6Address/ # requires QIPv6Address struct, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::setAddress\(\s*const\s+sockaddr/ # requires sockaddr struct, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::toIPv6Address\(/ # requires QIPv6Address struct

scripts/rpm-data/klayout.spec

@@ -77,6 +77,14 @@ Requires: libqt4-x11 >= 4.8.7
 %define pylib %{python3_sitearch}
 %endif
 
+%if "%{target_system}" == "opensuse15"
+# OpenSuSE Leap 15 requirements
+Requires:	ruby >= 2.5
+Requires:	python3 >= 3.6
+Requires: libqt4-x11 >= 4.8.7
+%define buildopt -j2
+%endif
+
 %description
 Mask layout viewer and editor for the chip design engineer.