[153952] trunk/dports/graphics/oce

[mps at macports.org]

Revision: 153952
          https://trac.macports.org/changeset/153952
Author:   mps at macports.org
Date:     2016-10-16 15:01:08 -0700 (Sun, 16 Oct 2016)
Log Message:
-----------
oce: future proof Sierra build issue.

Modified Paths:
--------------
    trunk/dports/graphics/oce/Portfile
    trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff

Modified: trunk/dports/graphics/oce/Portfile
===================================================================
--- trunk/dports/graphics/oce/Portfile	2016-10-16 21:01:24 UTC (rev 153951)
+++ trunk/dports/graphics/oce/Portfile	2016-10-16 22:01:08 UTC (rev 153952)
@@ -21,7 +21,8 @@
 
 depends_lib-append          port:freetype
 
-platform darwin 16 {
+# disable redundant definitions provided by OS time.h
+if {16 <= ${os.major}} {
     patchfiles-append       patch-src-OSD-OSD_Chronometer.cxx.diff
 }
 

Modified: trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff
===================================================================
--- trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff	2016-10-16 21:01:24 UTC (rev 153951)
+++ trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff	2016-10-16 22:01:08 UTC (rev 153952)
@@ -1,16 +1,13 @@
 --- src/OSD/OSD_Chronometer.cxx.orig	2016-06-02 07:18:16.000000000 -0500
-+++ src/OSD/OSD_Chronometer.cxx	2016-10-16 15:01:08.000000000 -0500
-@@ -51,9 +51,10 @@
++++ src/OSD/OSD_Chronometer.cxx	2016-10-16 16:56:36.000000000 -0500
+@@ -51,10 +51,6 @@
    #include <mach/mach.h>
  #endif
  
 -#if defined(__APPLE__) && defined(__MACH__)
 -#include "gettime_osx.h"
 -#endif
-+//Not needed for Sierra
-+//#if defined(__APPLE__) && defined(__MACH__)
-+//#include "gettime_osx.h"
-+//#endif
- 
+-
  //=======================================================================
  //function : GetProcessCPU
+ //purpose  :
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161016/203ec6ad/attachment-0002.html>