diff options
| author | antoine <antoine@FreeBSD.org> | 2017-11-10 06:17:07 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2017-11-10 06:17:07 +0800 |
| commit | 996cc4a69346b3cf059b3c648ef2e0c61e56bc38 (patch) | |
| tree | 4ef8c9721b5f85ea245098f1570bc1ae36b02837 /cad | |
| parent | e41dd060ebff364d407a03cd1aed658fed33c90e (diff) | |
| download | freebsd-ports-gnome-996cc4a69346b3cf059b3c648ef2e0c61e56bc38.tar.gz freebsd-ports-gnome-996cc4a69346b3cf059b3c648ef2e0c61e56bc38.tar.zst freebsd-ports-gnome-996cc4a69346b3cf059b3c648ef2e0c61e56bc38.zip | |
Fix the context of some patches so that they apply with stricter patch(1)
PR: 223545
With hat: portmgr
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/meshlab/files/patch-common_common.pro | 15 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_core_RS.cpp | 14 |
2 files changed, 17 insertions, 12 deletions
diff --git a/cad/meshlab/files/patch-common_common.pro b/cad/meshlab/files/patch-common_common.pro index c3be6a6c3efe..11bcb9195e1f 100644 --- a/cad/meshlab/files/patch-common_common.pro +++ b/cad/meshlab/files/patch-common_common.pro @@ -1,8 +1,11 @@ ---- common/common.pro.orig 2013-10-31 13:57:32.000000000 +0100 -+++ common/common.pro 2013-10-31 14:00:10.000000000 +0100 -@@ -126,3 +126,5 @@ - linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead - - #RESOURCES = common.qrc +--- common/common.pro.orig 2014-02-07 09:38:24 UTC ++++ common/common.pro +@@ -126,6 +126,8 @@ SOURCES += filterparameter.cpp \ + #win32-msvc2008:LIBS += ../external/lib/win32-msvc2008/jhead.lib + #win32-msvc2010:LIBS += ../external/lib/win32-msvc2010/jhead.lib + #win32-msvc2012:LIBS += ../external/lib/win32-msvc2012/jhead.lib + +CONFIG += static + #win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead + #linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead + #linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead diff --git a/cad/qcad/files/patch-src_core_RS.cpp b/cad/qcad/files/patch-src_core_RS.cpp index 9663a39262db..2238fc4983c8 100644 --- a/cad/qcad/files/patch-src_core_RS.cpp +++ b/cad/qcad/files/patch-src_core_RS.cpp @@ -1,11 +1,13 @@ ---- src/core/RS.cpp.orig 2015-01-30 18:11:57.235513076 +0100 -+++ src/core/RS.cpp 2015-01-30 18:12:23.988630795 +0100 -@@ -119,4 +119,8 @@ - */ +--- src/core/RS.cpp.orig 2017-07-21 17:57:53 UTC ++++ src/core/RS.cpp +@@ -118,6 +118,10 @@ QStringList RS::getDirectoryList(const Q + } + #ifdef Q_OS_MAC +#ifdef Q_OS_FREEBSD + dirList.append("%%DATADIR%%/" + subDirectory); +#endif + - // Individual directories: - /* + // Mac OS X app bundle: + dirList.append(appDir + "/../Resources/" + subDirectory); + dirList.append(appDir + "/../../../" + subDirectory); |