Re: UPDATE: cad/qcad

On Sat Mar 28, 2020 at 08:48:57AM +0100, Rafael Sadowski wrote:
> On Sat Mar 21, 2020 at 10:30:12AM +0100, Rafael Sadowski wrote:
> > This is a result of debugging qt5-cups. Starts fine and feels usable on
> > amd64. Any consumers around?
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/cad/qcad/Makefile,v
> > retrieving revision 1.36
> > diff -u -p -u -p -r1.36 Makefile
> > --- Makefile 7 Mar 2020 17:35:00 -0000 1.36
> > +++ Makefile 21 Mar 2020 09:22:40 -0000
> > @@ -4,10 +4,9 @@ COMMENT = Qt-based 2D CAD system
> >
> > GH_ACCOUNT = qcad
> > GH_PROJECT = qcad
> > -GH_TAGNAME = v3.23.0.0
> > -REVISION = 1
> > +GH_TAGNAME = v3.24.3.0
> >
> > -SO_VERSION = 0.0
> > +SO_VERSION = 1.0
> > QCAD_LIBS = qcadcore \
> > qcadecmaapi \
> > qcadentity \
> > @@ -22,6 +21,17 @@ QCAD_LIBS = qcadcore \
> > .for _lib in ${QCAD_LIBS}
> > SHARED_LIBS += ${_lib} ${SO_VERSION}
> > .endfor
> > +
> > +SHARED_LIBS += qtscript_core 0.0 # 1.0
> > +SHARED_LIBS += qtscript_gui 0.0 # 1.0
> > +SHARED_LIBS += qtscript_network 0.0 # 1.0
> > +SHARED_LIBS += qtscript_opengl 0.0 # 1.0
> > +SHARED_LIBS += qtscript_printsupport 0.0 # 1.0
> > +SHARED_LIBS += qtscript_sql 0.0 # 1.0
> > +SHARED_LIBS += qtscript_uitools 0.0 # 1.0
> > +SHARED_LIBS += qtscript_widgets 0.0 # 1.0
> > +SHARED_LIBS += qtscript_xml 0.0 # 1.0
> > +SHARED_LIBS += qtscript_xmlpatterns 0.0 # 1.0
> >
>
> New diff without plugins in SHARED_LIBS, hint by jca@, thanks.
>
> OK?
>

Only qcad diff, sorry for the mess and thanks paco@.

diff --git cad/qcad/Makefile cad/qcad/Makefile
index f54b1c1453f..a0bd814c5e4 100644
--- cad/qcad/Makefile
+++ cad/qcad/Makefile
@@ -4,10 +4,9 @@ COMMENT = Qt-based 2D CAD system

GH_ACCOUNT = qcad
GH_PROJECT = qcad
-GH_TAGNAME = v3.23.0.0
-REVISION = 1
+GH_TAGNAME = v3.24.3.0

-SO_VERSION = 0.0
+SO_VERSION = 1.0
QCAD_LIBS = qcadcore \
qcadecmaapi \
qcadentity \
diff --git cad/qcad/distinfo cad/qcad/distinfo
index 57f16e458b1..4c984aa3cb1 100644
--- cad/qcad/distinfo
+++ cad/qcad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qcad-3.23.0.0.tar.gz) = QuNmoKEpMPMYIc+23TKPiKceG4z8tzSlGtDqqLjqJws=
-SIZE (qcad-3.23.0.0.tar.gz) = 33296984
+SHA256 (qcad-3.24.3.0.tar.gz) = A1JZf9QfaKQ8+qrFsWufK9Dn2x12mGPJMXDeZMgEv3c=
+SIZE (qcad-3.24.3.0.tar.gz) = 33874174
diff --git cad/qcad/patches/patch-scripts_Help_About_About_js cad/qcad/patches/patch-scripts_Help_About_About_js
index d7b4cd5cf3f..b819f7a828e 100644
--- cad/qcad/patches/patch-scripts_Help_About_About_js
+++ cad/qcad/patches/patch-scripts_Help_About_About_js
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Help_About_About_js,v 1.1 2019/08/14 06:56:50 feinerer E
Index: scripts/Help/About/About.js
--- scripts/Help/About/About.js.orig
+++ scripts/Help/About/About.js
-@@ -451,6 +451,9 @@ About.prototype.initAboutSystem = function(textEdit) {
- if (RS.getSystemId()==="linux") {
- text += "Linux";
+@@ -467,6 +467,9 @@ About.prototype.initAboutSystem = function(textEdit) {
+ if (RS.getSystemId()==="solaris") {
+ text += "Solaris";
}
+ if (RS.getSystemId()==="openbsd") {
+ text += "OpenBSD";
diff --git cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
index 9adba7abac4..17bac6daa13 100644
--- cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
+++ cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Widgets_CommandLine_CommandLine_js,v 1.1 2019/08/14 06:5
Index: scripts/Widgets/CommandLine/CommandLine.js
--- scripts/Widgets/CommandLine/CommandLine.js.orig
+++ scripts/Widgets/CommandLine/CommandLine.js
-@@ -478,6 +478,9 @@ CommandLine.init = function(basePath) {
- case "linux":
- system = "Linux";
+@@ -490,6 +490,9 @@ CommandLine.init = function(basePath) {
+ case "solaris":
+ system = "Solaris";
break;
+ case "openbsd":
+ system = "OpenBSD";
diff --git cad/qcad/patches/patch-src_core_RSPlatform_cpp cad/qcad/patches/patch-src_core_RSPlatform_cpp
deleted file mode 100644
index 6e6da74b111..00000000000
--- cad/qcad/patches/patch-src_core_RSPlatform_cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_core_RSPlatform_cpp,v 1.1 2019/08/14 06:56:50 feinerer Exp $
-
-Index: src/core/RSPlatform.cpp
---- src/core/RSPlatform.cpp.orig
-+++ src/core/RSPlatform.cpp
-@@ -43,7 +43,7 @@
- QString RS::getHostId() {
- return QString("%1_%2")
- .arg(getSystemId())
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD)
- .arg(getenv("HOSTNAME"));
- #elif defined(Q_OS_MAC)
- // environment variable HOSTNAME not exported on OS X by default:
-@@ -56,7 +56,7 @@ QString RS::getHostId() {
- }
-
- /**
-- * \return Unique system ID ("linux", "osx", "win").
-+ * \return Unique system ID ("linux", "osx", "win", "openbsd").
- */
- QString RS::getSystemId() {
- #if defined(Q_OS_LINUX)
-@@ -65,6 +65,8 @@ QString RS::getSystemId() {
- return "osx";
- #elif defined(Q_OS_WIN)
- return "win";
-+#elif defined(Q_OS_OPENBSD)
-+ return "openbsd";
- #else
- return "unknown";
-