[109593] users/mojca/wxports/graphics/hugin-app

mojca at macports.org mojca at macports.org
Sun Aug 18 02:46:47 PDT 2013


Revision: 109593
          https://trac.macports.org/changeset/109593
Author:   mojca at macports.org
Date:     2013-08-18 02:46:46 -0700 (Sun, 18 Aug 2013)
Log Message:
-----------
mojca/hugin-app: minor patches, but the port is still broken (boost)

Modified Paths:
--------------
    users/mojca/wxports/graphics/hugin-app/Portfile

Added Paths:
-----------
    users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff

Modified: users/mojca/wxports/graphics/hugin-app/Portfile
===================================================================
--- users/mojca/wxports/graphics/hugin-app/Portfile	2013-08-18 08:46:25 UTC (rev 109592)
+++ users/mojca/wxports/graphics/hugin-app/Portfile	2013-08-18 09:46:46 UTC (rev 109593)
@@ -1,6 +1,8 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
+# 2013 RC is out, but this port is broken anyway because of boost incompatibilities with Apple
+
 PortSystem              1.0
 PortGroup               cmake 1.0
 PortGroup               wxwidgets 1.0
@@ -53,10 +55,15 @@
 #       but after it has been detected, it required swig-python
 #       and additional python definitions, else it failed to bulid
 
-# TODO: try to define or see where MAC_SELF_CONTAINED_BUNDLE gets defined
+# TODO: try to see where MAC_SELF_CONTAINED_BUNDLE gets defined
 
+# patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch - https://bugs.launchpad.net/bugs/1213586
+# patch-src-foreign-zthread-include-zthread-Guard.h.diff  - https://bugs.launchpad.net/bugs/1213585
+# patch-src-hugin1-hugin1.pch.diff                        - doesn't really help (at least not for clang)
+# patch-src-hugin1-base_wx-platform.h.diff                - fixed upstream
 patchfiles              patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch \
                         patch-src-foreign-zthread-include-zthread-Guard.h.diff \
+                        patch-src-hugin1-hugin1.pch.diff \
                         patch-src-hugin1-base_wx-platform.h.diff
 
 depends_run             port:enblend \
@@ -95,11 +102,7 @@
 }
 
 if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
-    if {[vercmp $xcodeversion 4.4] >= 0} {
-        default_variants    +wxgtk28
-    } else {
-        default_variants    +wxwidgets28
-    }
+    default_variants        +wxwidgets30
 }
 
 livecheck.type          regex

Added: users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
===================================================================
--- users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff	                        (rev 0)
+++ users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff	2013-08-18 09:46:46 UTC (rev 109593)
@@ -0,0 +1,12 @@
+--- src/hugin1/hugin1.pch.orig
++++ src/hugin1/hugin1.pch
+@@ -31,6 +31,9 @@
+ #ifndef _HUGIN1_PCH
+ #define _HUGIN1_PCH
+ 
++#if defined(__cplusplus) && defined(__APPLE__)
++#include <boost/random.hpp>
++#endif
+ 
+ #ifdef HUGIN_PRECOMP
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130818/107e597a/attachment.html>


More information about the macports-changes mailing list