svn commit: r522792 - in head/cad/qcad: . files
Michael Reifenberger
mr at FreeBSD.org
Sun Jan 12 15:57:11 UTC 2020
Author: mr
Date: Sun Jan 12 15:57:09 2020
New Revision: 522792
URL: https://svnweb.freebsd.org/changeset/ports/522792
Log:
Fixes and update to 3.24.1.0
Submitted by: Tamas Tevesz
Modified:
head/cad/qcad/Makefile
head/cad/qcad/distinfo
head/cad/qcad/files/patch-src_core_RS.cpp
head/cad/qcad/files/patch-src_core_RSettings.cpp
head/cad/qcad/files/patch-src_core_core.pro
Modified: head/cad/qcad/Makefile
==============================================================================
--- head/cad/qcad/Makefile Sun Jan 12 15:13:50 2020 (r522791)
+++ head/cad/qcad/Makefile Sun Jan 12 15:57:09 2020 (r522792)
@@ -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}|" \
Modified: head/cad/qcad/distinfo
==============================================================================
--- head/cad/qcad/distinfo Sun Jan 12 15:13:50 2020 (r522791)
+++ head/cad/qcad/distinfo Sun Jan 12 15:57:09 2020 (r522792)
@@ -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
Modified: head/cad/qcad/files/patch-src_core_RS.cpp
==============================================================================
--- head/cad/qcad/files/patch-src_core_RS.cpp Sun Jan 12 15:13:50 2020 (r522791)
+++ head/cad/qcad/files/patch-src_core_RS.cpp Sun Jan 12 15:57:09 2020 (r522792)
@@ -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);
Modified: head/cad/qcad/files/patch-src_core_RSettings.cpp
==============================================================================
--- head/cad/qcad/files/patch-src_core_RSettings.cpp Sun Jan 12 15:13:50 2020 (r522791)
+++ head/cad/qcad/files/patch-src_core_RSettings.cpp Sun Jan 12 15:57:09 2020 (r522792)
@@ -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
Modified: head/cad/qcad/files/patch-src_core_core.pro
==============================================================================
--- head/cad/qcad/files/patch-src_core_core.pro Sun Jan 12 15:13:50 2020 (r522791)
+++ head/cad/qcad/files/patch-src_core_core.pro Sun Jan 12 15:57:09 2020 (r522792)
@@ -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
More information about the svn-ports-all
mailing list