11 files changed, 21 insertions, 88 deletions
diff --git a/cad/qcad/files/patch-qcad.pro b/cad/qcad/files/patch-qcad.pro
index a60058b7b06f..e3cbdc0b4e6c 100644
--- a/cad/qcad/files/patch-qcad.pro
+++ b/cad/qcad/files/patch-qcad.pro
@@ -1,14 +1,14 @@
---- qcad.pro.orig	2018-06-19 20:32:20 UTC
+--- qcad.pro.orig	2019-05-04 22:28:42 UTC
 +++ qcad.pro
-@@ -12,9 +12,9 @@ win32 {
+@@ -11,9 +11,9 @@ win32 {
          SUBDIRS += ..\\$$dir
      }
  }
 -else {
--    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v $(basename $(pwd))$ | grep -v qcadmobile")
+-    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v $(basename $(pwd))$")
 -}
 +#else {
-+#    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v $(basename $(pwd))$ | grep -v qcadmobile")
++#    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v $(basename $(pwd))$")
 +#}
  
  !r_mobile {
diff --git a/cad/qcad/files/patch-shared_app.pri b/cad/qcad/files/patch-shared_app.pri
index 8e989b4e3e9d..46bc1de53da3 100644
--- a/cad/qcad/files/patch-shared_app.pri
+++ b/cad/qcad/files/patch-shared_app.pri
@@ -1,11 +1,6 @@
---- shared_app.pri.orig	2018-06-19 20:32:20 UTC
+--- shared_app.pri.orig	2019-05-04 22:28:42 UTC
 +++ shared_app.pri
-@@ -13,12 +13,12 @@ LIBS += \
-     -l$${RLIBNAME}stemmer \
-     -lstemmer \
-     -l$${RLIBNAME}zip \
--    -lquazip
-+    -lquazip5
+@@ -15,8 +15,8 @@ LIBS += \
  
  !r_no_opennurbs {
      LIBS += \
diff --git a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro
index bfa6892fc13a..fd8a6e78c527 100644
--- a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro
+++ b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro
@@ -1,33 +1,17 @@
 Second hunk: fix a version of the shipped qtscriptgenerator, as when updating Qt, the new one might
 not yet be bundled in the tarball.
 
---- src/3rdparty/3rdparty.pro.orig	2018-07-03 13:46:04 UTC
+--- src/3rdparty/3rdparty.pro.orig	2019-05-04 22:28:42 UTC
 +++ src/3rdparty/3rdparty.pro
-@@ -2,21 +2,19 @@ include (../../shared.pri)
- TEMPLATE = subdirs
- SUBDIRS = \
+@@ -4,9 +4,8 @@ SUBDIRS = \
      spatialindexnavel \
--    stemmer \
--    quazip
-+    stemmer
+     stemmer
  
 -!r_no_opennurbs {
 -    SUBDIRS += opennurbs
 -}
-+# FreeBSD: prefer quazip and opennurbs from dependent ports
++# FreeBSD: prefer opennurbs from dependent ports
 +
  !rs_no_dxf {
      SUBDIRS += dxflib
  }
- 
- !r_mobile {
--    exists(qt-labs-qtscriptgenerator-$${QT_VERSION}) {
--        SUBDIRS += qt-labs-qtscriptgenerator-$${QT_VERSION}
-+    exists(qt-labs-qtscriptgenerator-5.11.1) {
-+        SUBDIRS += qt-labs-qtscriptgenerator-5.11.1
-     }
-     else {
--        error("Script bindings not available for Qt version $${QT_VERSION}. You can add them to src/3rdparty/qt-labs-qtscriptgenerator-$${QT_VERSION} or use another version of Qt.")
-+        error("Script bindings not available for Qt version 5.11.1. You can add them to src/3rdparty/qt-labs-qtscriptgenerator-5.11.1 or use another version of Qt.")
-     }
- }
diff --git a/cad/qcad/files/patch-src_core_RS.cpp b/cad/qcad/files/patch-src_core_RS.cpp
index 2238fc4983c8..b546b60de50b 100644
--- a/cad/qcad/files/patch-src_core_RS.cpp
+++ b/cad/qcad/files/patch-src_core_RS.cpp
@@ -1,6 +1,6 @@
---- src/core/RS.cpp.orig	2017-07-21 17:57:53 UTC
+--- src/core/RS.cpp.orig	2019-05-01 14:25:33 UTC
 +++ src/core/RS.cpp
-@@ -118,6 +118,10 @@ QStringList RS::getDirectoryList(const Q
+@@ -146,6 +146,10 @@ QStringList RS::getDirectoryList(const QString& subDir
      }
  
  #ifdef Q_OS_MAC
diff --git a/cad/qcad/files/patch-src_core_RSettings.cpp b/cad/qcad/files/patch-src_core_RSettings.cpp
index bd5a252aae81..cdc38661aa4f 100644
--- a/cad/qcad/files/patch-src_core_RSettings.cpp
+++ b/cad/qcad/files/patch-src_core_RSettings.cpp
@@ -1,6 +1,6 @@
---- ./src/core/RSettings.cpp.orig	2013-08-06 17:32:09.000000000 +0200
-+++ ./src/core/RSettings.cpp	2013-08-09 15:25:25.000000000 +0200
-@@ -92,9 +92,13 @@
+--- src/core/RSettings.cpp.orig	2019-05-01 14:25:33 UTC
++++ src/core/RSettings.cpp
+@@ -346,9 +346,13 @@ QString RSettings::getApplicationPath() {
      }
  #endif
  
diff --git a/cad/qcad/files/patch-src_core_core.pro b/cad/qcad/files/patch-src_core_core.pro
index 800d7a3d4c68..d7460532bfa2 100644
--- a/cad/qcad/files/patch-src_core_core.pro
+++ b/cad/qcad/files/patch-src_core_core.pro
@@ -1,6 +1,6 @@
---- src/core/core.pro.orig	2018-06-19 20:32:20 UTC
+--- src/core/core.pro.orig	2019-05-01 14:25:33 UTC
 +++ src/core/core.pro
-@@ -287,7 +287,7 @@ RC_FILE = core.rc
+@@ -290,7 +290,7 @@ RC_FILE = core.rc
  OTHER_FILES += core.dox math/math.dox
  DEFINES += QCADCORE_LIBRARY
  
diff --git a/cad/qcad/files/patch-src_core_math_RSpline.h b/cad/qcad/files/patch-src_core_math_RSpline.h
index 3ce69ce1ab7b..4e17165ae997 100644
--- a/cad/qcad/files/patch-src_core_math_RSpline.h
+++ b/cad/qcad/files/patch-src_core_math_RSpline.h
@@ -1,4 +1,4 @@
---- src/core/math/RSpline.h.orig	2018-06-19 20:32:20 UTC
+--- src/core/math/RSpline.h.orig	2019-05-01 14:25:33 UTC
 +++ src/core/math/RSpline.h
 @@ -32,7 +32,7 @@
  #include "RPolyline.h"
@@ -8,4 +8,4 @@
 +#include <openNURBS/opennurbs.h>
  #endif
  
- 
+ #ifndef RDEFAULT_MIN1
diff --git a/cad/qcad/files/patch-src_scripting_ecmaapi_ecmaapi.pro b/cad/qcad/files/patch-src_scripting_ecmaapi_ecmaapi.pro
deleted file mode 100644
index 1422eff36dc8..000000000000
--- a/cad/qcad/files/patch-src_scripting_ecmaapi_ecmaapi.pro
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/scripting/ecmaapi/ecmaapi.pro.orig	2018-06-19 20:32:20 UTC
-+++ src/scripting/ecmaapi/ecmaapi.pro
-@@ -4,7 +4,6 @@ CONFIG += plugin
- TARGET = $${RLIBNAME}ecmaapi
- CONFIG -= warn_on
- CONFIG += warn_off
--CONFIG += precompile_header
- PRECOMPILED_HEADER = stable.h
- OTHER_FILES += ecmaapi.dox
- DEFINES += QCADECMAAPI_LIBRARY
-@@ -29,4 +28,4 @@ LIBS += \
-     -l$${RLIBNAME}spatialindex \
-     -l$${RLIBNAME}stemmer \
-     -l$${RLIBNAME}zip \
--    -lquazip
-+    -lquazip5
diff --git a/cad/qcad/files/patch-src_zip_RZip.cpp b/cad/qcad/files/patch-src_zip_RZip.cpp
deleted file mode 100644
index c483bf9f9df7..000000000000
--- a/cad/qcad/files/patch-src_zip_RZip.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zip/RZip.cpp.orig	2018-07-01 14:53:24 UTC
-+++ src/zip/RZip.cpp
-@@ -19,7 +19,7 @@
- //#include <QTextStream>
- //#include <QResource>
- 
--#include "JlCompress.h"
-+#include <quazip5/JlCompress.h>
- 
- #include "RZip.h"
- 
diff --git a/cad/qcad/files/patch-src_zip_zip.pro b/cad/qcad/files/patch-src_zip_zip.pro
deleted file mode 100644
index f826cae6b98b..000000000000
--- a/cad/qcad/files/patch-src_zip_zip.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/zip/zip.pro.orig	2018-07-01 14:10:25 UTC
-+++ src/zip/zip.pro
-@@ -1,6 +1,6 @@
- include( ../../shared.pri )
- 
--INCLUDEPATH+=../3rdparty/quazip/src
-+# INCLUDEPATH+=../3rdparty/quazip/src
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
-     INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
-@@ -23,7 +23,7 @@ else {
-     CONFIG += plugin
- }
- TARGET = $${RLIBNAME}zip
--LIBS += -l$${RLIBNAME}core -lquazip
-+LIBS += -l$${RLIBNAME}core -lquazip5
- OTHER_FILES += zip.dox
- DEFINES += QCADZIP_LIBRARY
- RC_FILE = zip.rc
diff --git a/cad/qcad/files/patch-support_ecmagenerator_src_srcml_RSpline.srcml b/cad/qcad/files/patch-support_ecmagenerator_src_srcml_RSpline.srcml
index d07b8aba8fa4..624cecc55179 100644
--- a/cad/qcad/files/patch-support_ecmagenerator_src_srcml_RSpline.srcml
+++ b/cad/qcad/files/patch-support_ecmagenerator_src_srcml_RSpline.srcml
@@ -1,4 +1,4 @@
---- support/ecmagenerator/src/srcml/RSpline.srcml.orig	2018-06-19 20:32:20 UTC
+--- support/ecmagenerator/src/srcml/RSpline.srcml.orig	2019-05-01 14:25:33 UTC
 +++ support/ecmagenerator/src/srcml/RSpline.srcml
 @@ -33,7 +33,7 @@
  <cpp:include>#<cpp:directive>include</cpp:directive> <cpp:file>"RPolyline.h"</cpp:file></cpp:include>
@@ -8,4 +8,4 @@
 +<cpp:include>#<cpp:directive>include</cpp:directive> <cpp:file>"openNURBS/opennurbs.h"</cpp:file></cpp:include>
  <cpp:endif>#<cpp:directive>endif</cpp:directive></cpp:endif>
  
- 
+ <cpp:ifndef>#<cpp:directive>ifndef</cpp:directive> <name>RDEFAULT_MIN1</name></cpp:ifndef>