diff options
| author | Michael Reifenberger <mr@FreeBSD.org> | 2020-01-12 15:57:09 +0000 |
|---|---|---|
| committer | Michael Reifenberger <mr@FreeBSD.org> | 2020-01-12 15:57:09 +0000 |
| commit | ff6c778a8e93a23c291b01893775ab1d0d871a2e (patch) | |
| tree | 96e60ca90ef3f37c1d80211b8546486f093e2fce /cad | |
| parent | e42f2c8636788ab8e0006dd5f2380fc616355c97 (diff) | |
| download | ports-ff6c778a8e93a23c291b01893775ab1d0d871a2e.tar.gz ports-ff6c778a8e93a23c291b01893775ab1d0d871a2e.zip | |
Notes
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/qcad/Makefile | 8 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 6 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_core_RS.cpp | 8 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_core_RSettings.cpp | 4 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_core_core.pro | 4 |
5 files changed, 13 insertions, 17 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 298a6ade5196..d1f17617c46d 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= qcad -PORTVERSION= 3.22.0.12 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 3.24.1.0 #PORTREVISION= +DISTVERSIONPREFIX= v CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} @@ -57,9 +56,6 @@ CFLAGS_i386= -fPIC CXXFLAGS_i386= -fPIC pre-configure: - ${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2 - ${CP} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.0/qt-labs-qtscriptgenerator-5.13.0.pro \ - ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2/qt-labs-qtscriptgenerator-5.13.2.pro ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RS.cpp ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 977c852b5a52..65c736020bc5 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1578831819 +SHA256 (qcad/qcad-qcad-v3.24.1.0_GH0.tar.gz) = fa5cf4a7057cb40779b3274b1a5219c244f326131f930535a63010922efd8b7d +SIZE (qcad/qcad-qcad-v3.24.1.0_GH0.tar.gz) = 33786828 diff --git a/cad/qcad/files/patch-src_core_RS.cpp b/cad/qcad/files/patch-src_core_RS.cpp index b546b60de50b..d0d34340a827 100644 --- a/cad/qcad/files/patch-src_core_RS.cpp +++ b/cad/qcad/files/patch-src_core_RS.cpp @@ -1,13 +1,13 @@ ---- src/core/RS.cpp.orig 2019-05-01 14:25:33 UTC +--- src/core/RS.cpp.orig 2019-12-23 11:24:24 UTC +++ src/core/RS.cpp -@@ -146,6 +146,10 @@ QStringList RS::getDirectoryList(const QString& subDir +@@ -145,6 +145,10 @@ QStringList RS::getDirectoryList(const QString& subDir + appDir = fi.absolutePath(); } - #ifdef Q_OS_MAC +#ifdef Q_OS_FREEBSD + dirList.append("%%DATADIR%%/" + subDirectory); +#endif + + #ifdef Q_OS_MAC // Mac OS X app bundle: dirList.append(appDir + "/../Resources/" + subDirectory); - dirList.append(appDir + "/../../../" + subDirectory); diff --git a/cad/qcad/files/patch-src_core_RSettings.cpp b/cad/qcad/files/patch-src_core_RSettings.cpp index cdc38661aa4f..81db59936cbf 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 2019-05-01 14:25:33 UTC +--- src/core/RSettings.cpp.orig 2019-12-23 11:24:24 UTC +++ src/core/RSettings.cpp -@@ -346,9 +346,13 @@ QString RSettings::getApplicationPath() { +@@ -363,9 +363,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 d7460532bfa2..0810b9b3a1dc 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 2019-05-01 14:25:33 UTC +--- src/core/core.pro.orig 2019-12-23 11:24:24 UTC +++ src/core/core.pro -@@ -290,7 +290,7 @@ RC_FILE = core.rc +@@ -295,7 +295,7 @@ RC_FILE = core.rc OTHER_FILES += core.dox math/math.dox DEFINES += QCADCORE_LIBRARY |