sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to v3.22.0.12

Browse source 
Submitted by:	Tamas TEVESZ
This commit is contained in:
Michael Reifenberger 2019-06-02 18:05:59 +00:00
parent 8ce74098e9
commit 3119197c54
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=503319
14 changed files with 83 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cad/qcad/Makefile
View file

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= qcad
PORTVERSION= 3.21.3.15
PORTVERSION= 3.22.0.12
DISTVERSIONPREFIX= v
PORTREVISION= 4
#PORTREVISION=
CATEGORIES= cad
DIST_SUBDIR= ${PORTNAME}
@ -15,7 +15,6 @@ LICENSE= GPLv3
BUILD_DEPENDS= bash:shells/bash \
${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
LIB_DEPENDS= libquazip5.so:archivers/quazip
MAKE_JOBS_UNSAFE=yes
@ -41,7 +40,7 @@ RESDIR= ${WRKSRC}/release
.endif
SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \
qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip
qcadsnap qcadspatialindex qcadstemmer spatialindexnavel
STALIBS= dxflib stemmer
SHRDIR= fonts libraries linetypes patterns plugins scripts themes ts
#QSCRIPTS should not be installed to avoid conflicts with texlive-base

6
cad/qcad/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1549572368
SHA256 (qcad/qcad-qcad-v3.21.3.15_GH0.tar.gz) = 95acbd7372e288d4d3f7ca46babcea49e6e7fb8ffe46cec21cb11b7ad2871164
SIZE (qcad/qcad-qcad-v3.21.3.15_GH0.tar.gz) = 43841552
TIMESTAMP = 1559498626
SHA256 (qcad/qcad-qcad-v3.22.0.12_GH0.tar.gz) = 0bf4de725144a873bc9ef2dccfc44364e5306fa4606afc969a275bc7a7593f3c
SIZE (qcad/qcad-qcad-v3.22.0.12_GH0.tar.gz) = 33288823

8
cad/qcad/files/patch-qcad.pro
View file

@ -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 {

9
cad/qcad/files/patch-shared_app.pri
View file

@ -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 += \

24
cad/qcad/files/patch-src_3rdparty_3rdparty.pro
View file

@ -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.")
}
}

4
cad/qcad/files/patch-src_core_RS.cpp
View file

@ -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

6
cad/qcad/files/patch-src_core_RSettings.cpp
View file

@ -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

4
cad/qcad/files/patch-src_core_core.pro
View file

@ -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

4
cad/qcad/files/patch-src_core_math_RSpline.h
View file

@ -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

16
cad/qcad/files/patch-src_scripting_ecmaapi_ecmaapi.pro
View file

@ -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

11
cad/qcad/files/patch-src_zip_RZip.cpp
View file

@ -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"

19
cad/qcad/files/patch-src_zip_zip.pro
View file

@ -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

4
cad/qcad/files/patch-support_ecmagenerator_src_srcml_RSpline.srcml
View file

@ -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>

60
cad/qcad/pkg-plist
View file

@ -19,8 +19,6 @@ lib/libqcadspatialindex.so
lib/libqcadspatialindex.so.0
lib/libqcadstemmer.so
lib/libqcadstemmer.so.0
lib/libqcadzip.so
lib/libqcadzip.so.0
lib/libspatialindexnavel.so
lib/libspatialindexnavel.so.0
lib/libstemmer.a
@ -78,8 +76,6 @@ lib/libstemmer.a
%%DATADIR%%/fonts/Symbol_Misc1.cxf
%%DATADIR%%/fonts/Symbol_Misc2.cxf
%%DATADIR%%/fonts/Unicode.cxf
%%DATADIR%%/fonts/VL-Gothic-Regular.cxf
%%DATADIR%%/fonts/VL-Gothic-Regular_license.txt
%%DATADIR%%/fonts/hershey.readme
%%DATADIR%%/fonts/ltypeshp.cxf
%%DATADIR%%/fonts/osifont.ttf
@ -4104,6 +4100,8 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Draw/Text/Tests/Text15.js
%%DATADIR%%/scripts/Draw/Text/Tests/Text16.js
%%DATADIR%%/scripts/Draw/Text/Tests/Text17.js
%%DATADIR%%/scripts/Draw/Text/Tests/Text18.js
%%DATADIR%%/scripts/Draw/Text/Tests/Text19.js
%%DATADIR%%/scripts/Draw/Text/Tests/actual/.gitignore
%%DATADIR%%/scripts/Draw/Text/Tests/data/text01.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/data/text02.dxf
@ -4122,6 +4120,8 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Draw/Text/Tests/data/text15.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/data/text16.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/data/text17.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/data/text18.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/data/text19.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text01_000.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text02_000.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text03_000.dxf
@ -4152,6 +4152,10 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text16_001.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text17_000.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text17_001.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text18_000.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text18_001.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text19_000.dxf
%%DATADIR%%/scripts/Draw/Text/Tests/required/Text19_001.dxf
%%DATADIR%%/scripts/Draw/Text/Text-inverse.svg
%%DATADIR%%/scripts/Draw/Text/Text.js
%%DATADIR%%/scripts/Draw/Text/Text.pro
@ -4695,13 +4699,24 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest01.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest02.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest03.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest04.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest05.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest06.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest07.js
%%DATADIR%%/scripts/Edit/Esc/Tests/EActionTest08.js
%%DATADIR%%/scripts/Edit/Esc/Tests/actual/.gitignore
%%DATADIR%%/scripts/Edit/Esc/Tests/data/entities.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/data/image.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/data/qcad_icon.png
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest00_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest01_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest02_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest03_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest04_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest05_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest06_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest07_000.dxf
%%DATADIR%%/scripts/Edit/Esc/Tests/required/EActionTest08_000.dxf
%%DATADIR%%/scripts/Edit/Esc/doc/Esc_de.html
%%DATADIR%%/scripts/Edit/Esc/doc/Esc_desc_de.html
%%DATADIR%%/scripts/Edit/Esc/doc/Esc_desc_en.html
@ -6311,6 +6326,7 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Misc/Examples/dir/dir.pro
%%DATADIR%%/scripts/Misc/Misc.js
%%DATADIR%%/scripts/Misc/Misc.pro
%%DATADIR%%/scripts/Misc/Misc.svg
%%DATADIR%%/scripts/Misc/MiscBlock/BlockFixNames/BlockFixNames.js
%%DATADIR%%/scripts/Misc/MiscBlock/BlockFixNames/BlockFixNames.pro
%%DATADIR%%/scripts/Misc/MiscBlock/BlockListAttributes/BlockListAttributes.js
@ -7640,12 +7656,19 @@ lib/libstemmer.a
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest00.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest01.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest02.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest03.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest05.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest06.js
%%DATADIR%%/scripts/Modify/Stretch/Tests/actual/.gitignore
%%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities0.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities1.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities2.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest00_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest01_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest02_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest03_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest05_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest06_000.dxf
%%DATADIR%%/scripts/Modify/Stretch/doc/Stretch.png
%%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.dxf
%%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.png
@ -10210,7 +10233,24 @@ lib/libstemmer.a
%%DATADIR%%/scripts/splashscreen.png
%%DATADIR%%/scripts/splashscreen@2x.png
%%DATADIR%%/scripts/sprintf.js
%%DATADIR%%/themes/Dark/checkbox_checked.png
%%DATADIR%%/themes/Dark/checkbox_checked_disabled.png
%%DATADIR%%/themes/Dark/checkbox_checked_focus.png
%%DATADIR%%/themes/Dark/checkbox_unchecked.png
%%DATADIR%%/themes/Dark/checkbox_unchecked_disabled.png
%%DATADIR%%/themes/Dark/checkbox_unchecked_focus.png
%%DATADIR%%/themes/Dark/close-hover.png
%%DATADIR%%/themes/Dark/close.png
%%DATADIR%%/themes/Dark/radio_checked.png
%%DATADIR%%/themes/Dark/radio_checked_disabled.png
%%DATADIR%%/themes/Dark/radio_checked_focus.png
%%DATADIR%%/themes/Dark/radio_unchecked.png
%%DATADIR%%/themes/Dark/radio_unchecked_disabled.png
%%DATADIR%%/themes/Dark/radio_unchecked_focus.png
%%DATADIR%%/themes/Dark/stylesheet.css
%%DATADIR%%/themes/Dark/stylesheet_linux.css
%%DATADIR%%/themes/Dark/triangle_down.png
%%DATADIR%%/themes/Dark/triangle_right.png
%%DATADIR%%/ts/assistant_ar.qm
%%DATADIR%%/ts/assistant_bg.qm
%%DATADIR%%/ts/assistant_cs.qm
@ -10301,6 +10341,8 @@ lib/libstemmer.a
%%DATADIR%%/ts/qcadcore_sl.ts
%%DATADIR%%/ts/qcadcore_sv.qm
%%DATADIR%%/ts/qcadcore_sv.ts
%%DATADIR%%/ts/qcadcore_th.qm
%%DATADIR%%/ts/qcadcore_th.ts
%%DATADIR%%/ts/qcadcore_tr.qm
%%DATADIR%%/ts/qcadcore_tr.ts
%%DATADIR%%/ts/qcadcore_zh_CN.qm
@ -10343,6 +10385,8 @@ lib/libstemmer.a
%%DATADIR%%/ts/qcadentity_sl.ts
%%DATADIR%%/ts/qcadentity_sv.qm
%%DATADIR%%/ts/qcadentity_sv.ts
%%DATADIR%%/ts/qcadentity_th.qm
%%DATADIR%%/ts/qcadentity_th.ts
%%DATADIR%%/ts/qcadentity_tr.qm
%%DATADIR%%/ts/qcadentity_tr.ts
%%DATADIR%%/ts/qcadentity_zh_CN.qm
@ -10385,6 +10429,8 @@ lib/libstemmer.a
%%DATADIR%%/ts/qcadgui_sl.ts
%%DATADIR%%/ts/qcadgui_sv.qm
%%DATADIR%%/ts/qcadgui_sv.ts
%%DATADIR%%/ts/qcadgui_th.qm
%%DATADIR%%/ts/qcadgui_th.ts
%%DATADIR%%/ts/qcadgui_tr.qm
%%DATADIR%%/ts/qcadgui_tr.ts
%%DATADIR%%/ts/qcadgui_zh_CN.qm
@ -10471,7 +10517,11 @@ lib/libstemmer.a
%%DATADIR%%/ts/qtbase_ja.qm
%%DATADIR%%/ts/qtbase_ko.qm
%%DATADIR%%/ts/qtbase_lv.qm
%%DATADIR%%/ts/qtbase_nl.qm
%%DATADIR%%/ts/qtbase_nl.ts
%%DATADIR%%/ts/qtbase_pl.qm
%%DATADIR%%/ts/qtbase_pt.qm
%%DATADIR%%/ts/qtbase_pt.ts
%%DATADIR%%/ts/qtbase_ru.qm
%%DATADIR%%/ts/qtbase_sk.qm
%%DATADIR%%/ts/qtbase_uk.qm
@ -10664,6 +10714,8 @@ lib/libstemmer.a
%%DATADIR%%/ts/scripts_sl.ts
%%DATADIR%%/ts/scripts_sv.qm
%%DATADIR%%/ts/scripts_sv.ts
%%DATADIR%%/ts/scripts_th.qm
%%DATADIR%%/ts/scripts_th.ts
%%DATADIR%%/ts/scripts_tr.qm
%%DATADIR%%/ts/scripts_tr.ts
%%DATADIR%%/ts/scripts_zh_CN.qm