diff options
| author | dholland <dholland@pkgsrc.org> | 2014-12-27 02:46:40 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-12-27 02:46:40 +0000 |
| commit | f11c9d183c3530d3ca0efac04f5e49f01d3d7bbd (patch) | |
| tree | 047f408a2fc6dbcdca16fdeab5c41c825199b7aa /graphics | |
| parent | 064343e0acc8123e16bf72df9ad2a37124ea8257 (diff) | |
| download | pkgsrc-f11c9d183c3530d3ca0efac04f5e49f01d3d7bbd.tar.gz | |
Adjust one of Joerg's clang patches so it still works on gcc.
This would be much easier if clang didn't lie about itself being gcc.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/hugin/distinfo | 4 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 843f38d99dc..4a42746b25f 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2013/06/27 15:51:49 joerg Exp $ +$NetBSD: distinfo,v 1.12 2014/12/27 02:46:40 dholland Exp $ SHA1 (hugin-2010.4.0.tar.bz2) = 47f25c0a8b97c27108e567bcd22203c87f268d07 RMD160 (hugin-2010.4.0.tar.bz2) = f97b8d37470443eb81c3e915e5f5efa91227b135 @@ -7,6 +7,6 @@ SHA1 (patch-ab) = 54f574d677b37569d4269efda5f0f2c6ab23432a SHA1 (patch-ac) = aac60aa6d3b99a632fce03749660e10ea82ad028 SHA1 (patch-src_celeste_Utilities.cpp) = e25f3f971745be18d4752523529a96146d1dc259 SHA1 (patch-src_foreign_vigra_vigra__impex_png_cxx) = 43ee756664ca8232b3006b76f12fb8ef55711575 -SHA1 (patch-src_foreign_vigra_vigra_cachedfileimage.hxx) = 0cf622fd8e0bc4dbaa32df5afd92a8b55f311439 +SHA1 (patch-src_foreign_vigra_vigra_cachedfileimage.hxx) = 7024471019e977f83a95d0a61fb7b82a9eba3681 SHA1 (patch-src_foreign_zthread_include_zthread_Guard.h) = ad6ebe3c0ca9b8cc659a70848b6449036c4ef0d2 SHA1 (patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp) = 7df1c978ef81f4d3fae46cc12aaa4d5917c4cb04 diff --git a/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx b/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx index 89fc74730c8..5e0f3b46cce 100644 --- a/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx +++ b/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx @@ -1,16 +1,17 @@ -$NetBSD: patch-src_foreign_vigra_vigra_cachedfileimage.hxx,v 1.1 2013/06/27 15:51:49 joerg Exp $ +$NetBSD: patch-src_foreign_vigra_vigra_cachedfileimage.hxx,v 1.2 2014/12/27 02:46:41 dholland Exp $ --- src/foreign/vigra/vigra/cachedfileimage.hxx.orig 2013-06-25 21:58:48.000000000 +0000 +++ src/foreign/vigra/vigra/cachedfileimage.hxx -@@ -554,11 +554,7 @@ class NotifyingDirectionSelector; +@@ -554,11 +554,11 @@ class NotifyingDirectionSelector; template <class T, class Notify> class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify> { -#ifdef __GNUC__ --friend class Notify::self_type; --#else ++#if defined(__GNUC__) && !defined(__clang__) + friend class Notify::self_type; + #else friend typename Notify::self_type; --#endif + #endif protected: NotifyingDirectionSelector(T base = 0) : current_(base), notify_(NULL) {} NotifyingDirectionSelector(NotifyingDirectionSelector const & rhs) : current_(rhs.current_), notify_(NULL) {} |