[124268] trunk/dports/graphics/synfigstudio
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 21 19:40:33 PDT 2014
Revision: 124268
https://trac.macports.org/changeset/124268
Author: ryandesign at macports.org
Date: 2014-08-21 19:40:33 -0700 (Thu, 21 Aug 2014)
Log Message:
-----------
synfigstudio: fix build with libc++ (#44443)
Modified Paths:
--------------
trunk/dports/graphics/synfigstudio/Portfile
Added Paths:
-----------
trunk/dports/graphics/synfigstudio/files/
trunk/dports/graphics/synfigstudio/files/patch-libc++.diff
Modified: trunk/dports/graphics/synfigstudio/Portfile
===================================================================
--- 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)
@@ -29,6 +29,8 @@
depends_lib port:gtkmm \
port:synfig
+patchfiles patch-libc++.diff
+
post-destroot {
set docdir ${destroot}${prefix}/share/doc/${name}
xinstall -d ${docdir}
Added: trunk/dports/graphics/synfigstudio/files/patch-libc++.diff
===================================================================
--- 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)
@@ -0,0 +1,301 @@
+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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140821/6a7cb828/attachment.html>
More information about the macports-changes
mailing list