<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[124268] trunk/dports/graphics/synfigstudio</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/124268">124268</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-21 19:40:33 -0700 (Thu, 21 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>synfigstudio: fix build with libc++ (#44443)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicssynfigstudioPortfile">trunk/dports/graphics/synfigstudio/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/synfigstudio/files/</li>
<li><a href="#trunkdportsgraphicssynfigstudiofilespatchlibcdiff">trunk/dports/graphics/synfigstudio/files/patch-libc++.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicssynfigstudioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/synfigstudio/Portfile (124267 => 124268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/synfigstudio/Portfile 2014-08-22 02:38:27 UTC (rev 124267)
+++ trunk/dports/graphics/synfigstudio/Portfile 2014-08-22 02:40:33 UTC (rev 124268)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> depends_lib port:gtkmm \
</span><span class="cx"> port:synfig
</span><span class="cx">
</span><ins>+patchfiles patch-libc++.diff
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> set docdir ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -d ${docdir}
</span></span></pre></div>
<a id="trunkdportsgraphicssynfigstudiofilespatchlibcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/synfigstudio/files/patch-libc++.diff (0 => 124268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/synfigstudio/files/patch-libc++.diff (rev 0)
+++ trunk/dports/graphics/synfigstudio/files/patch-libc++.diff 2014-08-22 02:40:33 UTC (rev 124268)
</span><span class="lines">@@ -0,0 +1,301 @@
</span><ins>+http://www.synfig.org/issues/thebuggenie/synfig/issues/504#comment_2259
+--- configure.orig
++++ configure
+@@ -19023,13 +19023,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+
+- #include <tr1/unordered_map>
++ #include <unordered_map>
+
+ int
+ main ()
+ {
+
+- std::tr1::unordered_map<int,int>::const_iterator iter;
++ std::unordered_map<int,int>::const_iterator iter;
+
+ ;
+ return 0;
+@@ -19043,6 +19043,48 @@ $as_echo "yes" >&6; }
+ $as_echo "#define HASH_MAP_CLASS HASH_MAP_NAMESPACE::unordered_map" >>confdefs.h
+
+
++$as_echo "#define HASH_MAP_H <unordered_map>" >>confdefs.h
++
++
++$as_echo "#define HASH_MAP_NAMESPACE std" >>confdefs.h
++
++
++$as_echo "#define FUNCTIONAL_H <functional>" >>confdefs.h
++
++
++$as_echo "#define FUNCTIONAL_HASH_ON_STRING 1" >>confdefs.h
++
++
++else
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tr1/unordered_map<int,int>::const_iterator" >&5
++$as_echo_n "checking for tr1/unordered_map<int,int>::const_iterator... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++
++ #include <tr1/unordered_map>
++
++int
++main ()
++{
++
++ std::tr1::unordered_map<int,int>::const_iterator iter;
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HASH_MAP_CLASS HASH_MAP_NAMESPACE::unordered_map" >>confdefs.h
++
++
+ $as_echo "#define HASH_MAP_H <tr1/unordered_map>" >>confdefs.h
+
+
+@@ -19057,9 +19099,9 @@ $as_echo "#define FUNCTIONAL_HASH_ON_STRING 1" >>confdefs.h
+
+ else
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- for ac_header in ext/hash_map
++ for ac_header in ext/hash_map
+ do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default"
+ if test "x$ac_cv_header_ext_hash_map" = xyes; then :
+@@ -19082,7 +19124,7 @@ $as_echo "#define FUNCTIONAL_H <ext/functional>" >>confdefs.h
+
+ else
+
+- as_fn_error $? "C++ compiler does not seem to support unordered containers" "$LINENO" 5
++ as_fn_error $? "C++ compiler does not seem to support unordered containers" "$LINENO" 5
+
+ fi
+
+@@ -19092,6 +19134,9 @@ done
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ # Check for unordered_set or hash_set headers
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_set<int,int>::const_iterator" >&5
+ $as_echo_n "checking for unordered_set<int,int>::const_iterator... " >&6; }
+@@ -19099,13 +19144,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+
+- #include <tr1/unordered_set>
++ #include <unordered_set>
+
+ int
+ main ()
+ {
+
+- std::tr1::unordered_set<int,int>::const_iterator iter;
++ std::unordered_set<int,int>::const_iterator iter;
+
+ ;
+ return 0;
+@@ -19119,6 +19164,42 @@ $as_echo "yes" >&6; }
+ $as_echo "#define HASH_SET_CLASS HASH_SET_NAMESPACE::unordered_set" >>confdefs.h
+
+
++$as_echo "#define HASH_SET_H <unordered_set>" >>confdefs.h
++
++
++$as_echo "#define HASH_SET_NAMESPACE std" >>confdefs.h
++
++
++else
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tr1/unordered_set<int,int>::const_iterator" >&5
++$as_echo_n "checking for tr1/unordered_set<int,int>::const_iterator... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++
++ #include <tr1/unordered_set>
++
++int
++main ()
++{
++
++ std::tr1::unordered_set<int,int>::const_iterator iter;
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HASH_SET_CLASS HASH_SET_NAMESPACE::unordered_set" >>confdefs.h
++
++
+ $as_echo "#define HASH_SET_H <tr1/unordered_set>" >>confdefs.h
+
+
+@@ -19127,9 +19208,9 @@ $as_echo "#define HASH_SET_NAMESPACE std::tr1" >>confdefs.h
+
+ else
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- for ac_header in ext/hash_set
++ for ac_header in ext/hash_set
+ do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_set" "ac_cv_header_ext_hash_set" "$ac_includes_default"
+ if test "x$ac_cv_header_ext_hash_set" = xyes; then :
+@@ -19149,7 +19230,7 @@ $as_echo "#define HASH_SET_NAMESPACE __gnu_cxx" >>confdefs.h
+
+ else
+
+- as_fn_error $? "C++ compiler does not seem to support unordered containers" "$LINENO" 5
++ as_fn_error $? "C++ compiler does not seem to support unordered containers" "$LINENO" 5
+
+ fi
+
+@@ -19159,6 +19240,9 @@ done
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ # -- H E A D E R S --------------------------------------------
+
+ for ac_header in unistd.h signal.h fcntl.h
+--- configure.ac.orig
++++ configure.ac
+@@ -195,25 +195,41 @@ if test $with_libfmod = "yes" ; then {
+ AC_MSG_CHECKING([for unordered_map<int,int>::const_iterator])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+- [#include <tr1/unordered_map>]
++ [#include <unordered_map>]
+ ],[
+- [std::tr1::unordered_map<int,int>::const_iterator iter;]
++ [std::unordered_map<int,int>::const_iterator iter;]
+ ])],[
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::unordered_map],[The template name for unordered maps.])
+- AC_DEFINE([HASH_MAP_H],[<tr1/unordered_map>],[The header file to include for unordered maps.])
+- AC_DEFINE([HASH_MAP_NAMESPACE],[std::tr1],[The namespace for unordered maps.])
+- AC_DEFINE([FUNCTIONAL_H],[<tr1/functional>],[The header file for hash<T>.])
++ AC_DEFINE([HASH_MAP_H],[<unordered_map>],[The header file to include for unordered maps.])
++ AC_DEFINE([HASH_MAP_NAMESPACE],[std],[The namespace for unordered maps.])
++ AC_DEFINE([FUNCTIONAL_H],[<functional>],[The header file for hash<T>.])
+ AC_DEFINE([FUNCTIONAL_HASH_ON_STRING],[1],[Define to 1 if hash<T> needs to use T=String rather than T=char* to hash strings.])
+ ],[
+ AC_MSG_RESULT([no])
+- AC_CHECK_HEADERS([ext/hash_map],[
+- AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::hash_map],[The template name for unordered maps.])
+- AC_DEFINE([HASH_MAP_H],[<ext/hash_map>],[The header file to include for unordered maps.])
+- AC_DEFINE([HASH_MAP_NAMESPACE],[__gnu_cxx],[The namespace for unordered maps.])
+- AC_DEFINE([FUNCTIONAL_H],[<ext/functional>],[The header file for hash<T>.])
++ AC_MSG_CHECKING([for tr1/unordered_map<int,int>::const_iterator])
++ AC_COMPILE_IFELSE([
++ AC_LANG_PROGRAM([
++ [#include <tr1/unordered_map>]
++ ],[
++ [std::tr1::unordered_map<int,int>::const_iterator iter;]
++ ])],[
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::unordered_map],[The template name for unordered maps.])
++ AC_DEFINE([HASH_MAP_H],[<tr1/unordered_map>],[The header file to include for unordered maps.])
++ AC_DEFINE([HASH_MAP_NAMESPACE],[std::tr1],[The namespace for unordered maps.])
++ AC_DEFINE([FUNCTIONAL_H],[<tr1/functional>],[The header file for hash<T>.])
++ AC_DEFINE([FUNCTIONAL_HASH_ON_STRING],[1],[Define to 1 if hash<T> needs to use T=String rather than T=char* to hash strings.])
+ ],[
+- AC_MSG_ERROR([C++ compiler does not seem to support unordered containers])
++ AC_MSG_RESULT([no])
++ AC_CHECK_HEADERS([ext/hash_map],[
++ AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::hash_map],[The template name for unordered maps.])
++ AC_DEFINE([HASH_MAP_H],[<ext/hash_map>],[The header file to include for unordered maps.])
++ AC_DEFINE([HASH_MAP_NAMESPACE],[__gnu_cxx],[The namespace for unordered maps.])
++ AC_DEFINE([FUNCTIONAL_H],[<ext/functional>],[The header file for hash<T>.])
++ ],[
++ AC_MSG_ERROR([C++ compiler does not seem to support unordered containers])
++ ])
+ ])
+ ])
+
+@@ -221,22 +237,36 @@ AC_COMPILE_IFELSE([
+ AC_MSG_CHECKING([for unordered_set<int,int>::const_iterator])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+- [#include <tr1/unordered_set>]
++ [#include <unordered_set>]
+ ],[
+- [std::tr1::unordered_set<int,int>::const_iterator iter;]
++ [std::unordered_set<int,int>::const_iterator iter;]
+ ])],[
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::unordered_set],[The template name for unordered sets.])
+- AC_DEFINE([HASH_SET_H],[<tr1/unordered_set>],[The header file to include for unordered sets.])
+- AC_DEFINE([HASH_SET_NAMESPACE],[std::tr1],[The namespace for unordered sets.])
++ AC_DEFINE([HASH_SET_H],[<unordered_set>],[The header file to include for unordered sets.])
++ AC_DEFINE([HASH_SET_NAMESPACE],[std],[The namespace for unordered sets.])
+ ],[
+ AC_MSG_RESULT([no])
+- AC_CHECK_HEADERS([ext/hash_set],[
+- AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::hash_set],[The template name for unordered sets.])
+- AC_DEFINE([HASH_SET_H],[<ext/hash_set>],[The header file to include for unordered sets.])
+- AC_DEFINE([HASH_SET_NAMESPACE],[__gnu_cxx],[The namespace for unordered sets.])
++ AC_MSG_CHECKING([for tr1/unordered_set<int,int>::const_iterator])
++ AC_COMPILE_IFELSE([
++ AC_LANG_PROGRAM([
++ [#include <tr1/unordered_set>]
++ ],[
++ [std::tr1::unordered_set<int,int>::const_iterator iter;]
++ ])],[
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::unordered_set],[The template name for unordered sets.])
++ AC_DEFINE([HASH_SET_H],[<tr1/unordered_set>],[The header file to include for unordered sets.])
++ AC_DEFINE([HASH_SET_NAMESPACE],[std::tr1],[The namespace for unordered sets.])
+ ],[
+- AC_MSG_ERROR([C++ compiler does not seem to support unordered containers])
++ AC_MSG_RESULT([no])
++ AC_CHECK_HEADERS([ext/hash_set],[
++ AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::hash_set],[The template name for unordered sets.])
++ AC_DEFINE([HASH_SET_H],[<ext/hash_set>],[The header file to include for unordered sets.])
++ AC_DEFINE([HASH_SET_NAMESPACE],[__gnu_cxx],[The namespace for unordered sets.])
++ ],[
++ AC_MSG_ERROR([C++ compiler does not seem to support unordered containers])
++ ])
+ ])
+ ])
+
+--- src/gui/preview.cpp.orig
++++ src/gui/preview.cpp
+@@ -54,7 +54,7 @@
+ #include <cstdio>
+ #include <ctype.h>
+ #include <math.h>
+-#include <synfig/string_decl.h>
++#include <synfig/string.h>
+
+ #endif
+
</ins></span></pre>
</div>
</div>
</body>
</html>