diff options
Diffstat (limited to 'cad/qcad/files/patch-src_3rdparty_3rdparty.pro')
| -rw-r--r-- | cad/qcad/files/patch-src_3rdparty_3rdparty.pro | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro index e45d162f3770..bfa6892fc13a 100644 --- a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro +++ b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro @@ -1,18 +1,33 @@ ---- src/3rdparty/3rdparty.pro.orig 2015-11-24 15:13:30.000000000 +0100 -+++ src/3rdparty/3rdparty.pro 2015-12-23 10:01:28.113511000 +0100 -@@ -2,12 +2,10 @@ +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 +@@ -2,21 +2,19 @@ include (../../shared.pri) TEMPLATE = subdirs SUBDIRS = \ spatialindexnavel \ - stemmer \ - quazip + stemmer -+ -+# FreeBSD: prefer quazip and opennurbs from dependent ports -!r_no_opennurbs { - SUBDIRS += opennurbs -} ++# FreeBSD: prefer quazip and 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.") + } + } |