pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

freecad: fix build on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Sep 6 22:37:32 2017 +0200
Changeset:	e621c5e97b056324eef9ca5296fd99a49fbdf708

Modified Files:
	freecad/distinfo
	freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp
	freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp

Log Message:
freecad: fix build on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e621c5e97b056324eef9ca5296fd99a49fbdf708

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freecad/distinfo                                                    | 4 ++--
 .../patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp   | 6 +++---
 .../patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/freecad/distinfo b/freecad/distinfo
index 07e875b233..23b3ddff75 100644
--- a/freecad/distinfo
+++ b/freecad/distinfo
@@ -5,8 +5,8 @@ RMD160 (freecad-0.16.tar.gz) = 47eef6c13df03dfa424a0b9389b9b549a7569c6c
 SHA512 (freecad-0.16.tar.gz) = bc9dc8122cabd9a84f2b955746818e0d77ae90e68747ec96521099472b7803df9ff794ed823d6eb29352bd0538b8f01cf81c306ff427f1af2ee049f8f7096dbb
 Size (freecad-0.16.tar.gz) = 111706127 bytes
 SHA1 (patch-CMakeLists.txt) = 7a89a8ea491b8cb234c768a3e8b82878bd1bbf9e
-SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp) = 38bed1dd4708a83dd06fea2fbc5547513f7156cd
-SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp) = ebef7e0abdd3ada326e607c931a46099ad93cefc
+SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp) = 26e640d87715e323474ebb743c8ede55deb42077
+SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp) = 394c55da62b7a31a4e24820b224c699329019d9a
 SHA1 (patch-src_App_Application.cpp) = 7f23ee068ae97695c81a847ebf93abce9f8db2c7
 SHA1 (patch-src_App_CMakeLists.txt) = c73a2a69235bf62ae0a1d45101fd021826aed9cf
 SHA1 (patch-src_App_FreeCADInit.py) = 81ff70632cdb15ab4ebd744da64f691bf621f3d2
diff --git a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp b/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp
index 42c4744090..20e3c7114a 100644
--- a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp
+++ b/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__MemoryLimit.cpp
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp.orig	2016-04-02 13:29:08.000000000 +0000
+--- src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp.orig	2016-04-07 01:39:34.000000000 +0000
 +++ src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
 @@ -28,7 +28,7 @@
  // to the system. (PAL16631)
  //
  #ifndef WIN32
 -#if !(defined(__MACH__) && defined(__APPLE__))
-+#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__)
++#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__NetBSD__)
  #include <sys/sysinfo.h>
  #endif
  #endif
@@ -16,7 +16,7 @@ $NetBSD$
  int main (int argc, char ** argv)
  {
 -#if (defined(__MACH__) && defined(__APPLE__))
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__) || defined(__NetBSD__)
  	//do nothing
  #else
    // To better understand what is going on here, consult bug [SALOME platform 0019911]
diff --git a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp b/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp
index 3dca3a73b0..43a500490d 100644
--- a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp
+++ b/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig	2016-04-02 13:29:08.000000000 +0000
+--- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig	2016-04-07 01:39:34.000000000 +0000
 +++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
 @@ -43,7 +43,7 @@
  using namespace std;
  
  #ifndef WIN32
 -#if !(defined(__MACH__) && defined(__APPLE__))
-+#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__)
++#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__NetBSD__)
  #include <sys/sysinfo.h>
  #endif
  #endif
@@ -16,7 +16,7 @@ $NetBSD$
  int SMDS_Mesh::CheckMemory(const bool doNotRaise) throw (std::bad_alloc)
  {
 -#if (defined(__MACH__) && defined(__APPLE__))
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__) || defined(__NetBSD__)
  	return 1000;
  #else	
  #ifndef WIN32


Home | Main Index | Thread Index | Old Index