CVS commit: pkgsrc/cad/occt

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Feb 13 15:59:14 UTC 2023

Modified Files:
        pkgsrc/cad/occt: distinfo
        pkgsrc/cad/occt/patches: patch-src_OSD_OSD__MemInfo.cxx

Log Message:
occt: make a patch Linux-compatible


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/occt/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx

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

Modified files:

Index: pkgsrc/cad/occt/distinfo
diff -u pkgsrc/cad/occt/distinfo:1.2 pkgsrc/cad/occt/distinfo:1.3
--- pkgsrc/cad/occt/distinfo:1.2        Sun Feb 12 16:03:28 2023
+++ pkgsrc/cad/occt/distinfo    Mon Feb 13 15:59:14 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2023/02/12 16:03:28 tnn Exp $
+$NetBSD: distinfo,v 1.3 2023/02/13 15:59:14 tnn Exp $
 
 BLAKE2s (opencascade-7.7.0.tgz) = 3ac0f49a8d50e3c5eb86192f3d9d7bb1c52ae58e7f4816d32a9971665bbd0c0b
 SHA512 (opencascade-7.7.0.tgz) = 27ed889bbe95fa40fbb1840788ce0f2c58af67a6fec799f5705f6cad2567fcfeddbe461ba1854b65672392a604f8b41fed1f77b2cc0704f83746a58957d830c7
@@ -6,7 +6,7 @@ Size (opencascade-7.7.0.tgz) = 48391263 
 SHA1 (patch-CMakeLists.txt) = d6f533f8a54881b060e05ed816cb6e9bbfe0c5a8
 SHA1 (patch-adm_cmake_occt__macros.cmake) = 9f17527238443cc770d2def9ad8211f410fae7f4
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213
-SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 39c8361e401a7cef9e04f05ab72c96c83126c507
+SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 6cd4e1095abcadeb3c2df27b2669853764aa5a32
 SHA1 (patch-src_OSD_OSD__Path.cxx) = 14763ec177b7f571350be6ef7bc36e301d57cd1e
 SHA1 (patch-src_OSD_OSD__signal.cxx) = 5a6a6d914340368d089a7bcaadf1aacfeef9bed8
 SHA1 (patch-src_OpenGl_OpenGl__ShaderObject.cxx) = 804cbd76d7377ca003442374b5fcfad951984f37

Index: pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx
diff -u pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx:1.1 pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx:1.2
--- pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx:1.1  Sun Feb 12 14:42:25 2023
+++ pkgsrc/cad/occt/patches/patch-src_OSD_OSD__MemInfo.cxx      Mon Feb 13 15:59:14 2023
@@ -1,15 +1,17 @@
-$NetBSD: patch-src_OSD_OSD__MemInfo.cxx,v 1.1 2023/02/12 14:42:25 tnn Exp $
+$NetBSD: patch-src_OSD_OSD__MemInfo.cxx,v 1.2 2023/02/13 15:59:14 tnn Exp $
 
 From cad/oce 1.1 2017/01/20 11:00:50 fhajny:
 Use stdlib.h instead of malloc.h
 
 --- src/OSD/OSD_MemInfo.cxx.orig       2022-11-11 22:19:44.000000000 +0000
 +++ src/OSD/OSD_MemInfo.cxx
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,10 @@
    #include <malloc/malloc.h>
  #else
    #include <unistd.h>
--  #include <malloc.h>
++  #if defined(__linux__)
+   #include <malloc.h>
++  #endif
 +  #include <stdlib.h>
  #endif