[110894] trunk/dports/graphics/hugin-app

[mojca at macports.org]

Revision: 110894
          https://trac.macports.org/changeset/110894
Author:   mojca at macports.org
Date:     2013-09-09 11:35:15 -0700 (Mon, 09 Sep 2013)
Log Message:
-----------
hugin-app: comments related to upstream patches

Modified Paths:
--------------
    trunk/dports/graphics/hugin-app/Portfile
    trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
    trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
    trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff

Modified: trunk/dports/graphics/hugin-app/Portfile
===================================================================
--- trunk/dports/graphics/hugin-app/Portfile	2013-09-09 16:27:25 UTC (rev 110893)
+++ trunk/dports/graphics/hugin-app/Portfile	2013-09-09 18:35:15 UTC (rev 110894)
@@ -80,7 +80,8 @@
 # prevents some compiler errors
 configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
 
-# if this option works ok, others may be removed
+# version 2013.0.0 most probably works OK with wxWidgets 2.9,
+# so all these wxWidgets-related options can probably be removed once tested
 variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxWidgets 2.9 (experimental)} {
     wxWidgets.use           wxWidgets-3.0
     depends_lib-append      port:${wxWidgets.port}

Modified: trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch	2013-09-09 16:27:25 UTC (rev 110893)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch	2013-09-09 18:35:15 UTC (rev 110894)
@@ -1,12 +1,13 @@
-wrong patch, but a temporary workaround for clang
---- src/foreign/vigra/vigra/cachedfileimage.hxx
+upstream patch
+http://sourceforge.net/p/hugin/hugin/ci/752123441af3ca9d1977081b59f480b9a161247f/
+--- src/foreign/vigra/vigra/cachedfileimage.hxx.orig
 +++ src/foreign/vigra/vigra/cachedfileimage.hxx
-@@ -555,7 +555,7 @@ template <class T, class Notify>
+@@ -554,7 +554,7 @@
+ template <class T, class Notify>
  class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify>
  {
- #ifdef __GNUC__
--friend class Notify::self_type;
-+friend typename Notify::self_type;
+-#ifdef __GNUC__
++#if defined __GNUC__ && !defined __clang__
+ friend class Notify::self_type;
  #else
  friend typename Notify::self_type;
- #endif

Modified: trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff	2013-09-09 16:27:25 UTC (rev 110893)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff	2013-09-09 18:35:15 UTC (rev 110894)
@@ -1,5 +1,6 @@
-report this bug upstream
---- src/foreign/zthread/include/zthread/Guard.h
+upstream patch
+http://sourceforge.net/p/hugin/hugin/ci/e07f13ff32a0677de4181f470792dcf770864378/
+--- src/foreign/zthread/include/zthread/Guard.h.orig
 +++ src/foreign/zthread/include/zthread/Guard.h
 @@ -108,7 +108,7 @@ class CompoundScope {
    }

Modified: trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff	2013-09-09 16:27:25 UTC (rev 110893)
+++ trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff	2013-09-09 18:35:15 UTC (rev 110894)
@@ -1,4 +1,4 @@
-report upstream
+quick workaround; upstream has this fixed in 2013.0.0 and later
 --- src/hugin1/base_wx/platform.h
 +++ src/hugin1/base_wx/platform.h
 @@ -42,7 +42,11 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130909/b322735e/attachment.html>