[81084] trunk/dports/graphics/cairo-devel
ryandesign at macports.org
ryandesign at macports.org
Mon Jul 25 00:08:25 PDT 2011
Revision: 81084
http://trac.macports.org/changeset/81084
Author: ryandesign at macports.org
Date: 2011-07-25 00:08:25 -0700 (Mon, 25 Jul 2011)
Log Message:
-----------
cairo-devel: merge r81083 from cairo: allegedly fix build on Lion with llvm-gcc-4.2 / clang (#29842) and +quartz (#30351)
Revision Links:
--------------
http://trac.macports.org/changeset/81083
Modified Paths:
--------------
trunk/dports/graphics/cairo-devel/Portfile
Added Paths:
-----------
trunk/dports/graphics/cairo-devel/files/
trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff
trunk/dports/graphics/cairo-devel/files/lion_fonts.diff
Removed Paths:
-------------
trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff
trunk/dports/graphics/cairo-devel/files/lion_fonts.diff
Property Changed:
----------------
trunk/dports/graphics/cairo-devel/
Property changes on: trunk/dports/graphics/cairo-devel
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/graphics/cairo:81083
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2011-07-25 07:04:26 UTC (rev 81083)
+++ trunk/dports/graphics/cairo-devel/Portfile 2011-07-25 07:08:25 UTC (rev 81084)
@@ -10,7 +10,7 @@
conflicts cairo
set my_name cairo
version 1.11.2
-revision 1
+revision 2
categories graphics
maintainers ryandesign
license LGPL-2.1 MPL-1.1
@@ -51,6 +51,12 @@
minimum_xcodeversions {8 2.4.1}
+if {${configure.compiler} == "llvm-gcc-4.2" || ${configure.compiler} == "clang"} {
+ # -flto breaks static libs as .o files are llvm bitcode rather than Mach-O.
+ # The alternative would be to configure with --disable-static.
+ patchfiles-append configure_disable_lto.diff
+}
+
pre-configure {
set pixman_minimum_version 0.20.2
set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
@@ -98,6 +104,10 @@
configure.compiler gcc-4.2
}
+platform darwin 11 {
+ patchfiles-append lion_fonts.diff
+}
+
variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
variant x11 conflicts no_x11 description {Enable X11 support} {
depends_lib-append port:xrender port:xorg-xcb-util
Deleted: trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff
===================================================================
--- trunk/dports/graphics/cairo/files/configure_disable_lto.diff 2011-07-25 07:04:26 UTC (rev 81083)
+++ trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff 2011-07-25 07:08:25 UTC (rev 81084)
@@ -1,11 +0,0 @@
---- configure.orig 2010-12-26 01:22:57.000000000 +1100
-+++ configure 2011-06-16 18:24:02.000000000 +1000
-@@ -17236,7 +17236,7 @@
- MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
- -erroff=E_ENUM_TYPE_MISMATCH_OP"
-
--MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
-+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
-
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
-
Copied: trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff (from rev 81083, trunk/dports/graphics/cairo/files/configure_disable_lto.diff)
===================================================================
--- trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff 2011-07-25 07:08:25 UTC (rev 81084)
@@ -0,0 +1,11 @@
+--- configure.orig 2010-12-26 01:22:57.000000000 +1100
++++ configure 2011-06-16 18:24:02.000000000 +1000
+@@ -17236,7 +17236,7 @@
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ -erroff=E_ENUM_TYPE_MISMATCH_OP"
+
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+
Deleted: trunk/dports/graphics/cairo-devel/files/lion_fonts.diff
===================================================================
--- trunk/dports/graphics/cairo/files/lion_fonts.diff 2011-07-25 07:04:26 UTC (rev 81083)
+++ trunk/dports/graphics/cairo-devel/files/lion_fonts.diff 2011-07-25 07:08:25 UTC (rev 81084)
@@ -1,48 +0,0 @@
-diff --git a/perf/cairo-perf-report.c perf/cairo-perf-report.c
-index 8ab8090..a3d8bdb 100644
---- a/perf/cairo-perf-report.c
-+++ perf/cairo-perf-report.c
-@@ -49,7 +49,7 @@
- typedef ptrdiff_t ssize_t;
- #endif
-
--#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
-+#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
- static ssize_t
- getline (char **lineptr,
- size_t *n,
-@@ -234,7 +234,7 @@ test_report_parse (test_report_t *report,
- * as needed. These aren't necessary full-fledged general purpose
- * implementations. They just get the job done for our purposes.
- */
--#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
-+#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
- #define POORMANS_GETLINE_BUFFER_SIZE (65536)
- static ssize_t
- getline (char **lineptr,
-diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
-index ff22882..b3a4679 100644
---- a/perf/cairo-perf-trace.c
-+++ perf/cairo-perf-trace.c
-@@ -527,7 +527,7 @@ usage (const char *argv0)
- argv0, argv0);
- }
-
--#ifndef __USE_GNU
-+#if !defined __USE_GNU && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
- #define POORMANS_GETLINE_BUFFER_SIZE (65536)
- static ssize_t
- getline (char **lineptr,
-diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
-index f529fc9..1e57c39 100644
---- a/src/cairo-quartz-font.c
-+++ src/cairo-quartz-font.c
-@@ -802,7 +802,7 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font)
- return ffont->cgFont;
- }
-
--#ifndef __LP64__
-+#if !defined __LP64__ && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
- /*
- * compat with old ATSUI backend
- */
Copied: trunk/dports/graphics/cairo-devel/files/lion_fonts.diff (from rev 81083, trunk/dports/graphics/cairo/files/lion_fonts.diff)
===================================================================
--- trunk/dports/graphics/cairo-devel/files/lion_fonts.diff (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/lion_fonts.diff 2011-07-25 07:08:25 UTC (rev 81084)
@@ -0,0 +1,48 @@
+diff --git a/perf/cairo-perf-report.c perf/cairo-perf-report.c
+index 8ab8090..a3d8bdb 100644
+--- a/perf/cairo-perf-report.c
++++ perf/cairo-perf-report.c
+@@ -49,7 +49,7 @@
+ typedef ptrdiff_t ssize_t;
+ #endif
+
+-#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
++#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+ static ssize_t
+ getline (char **lineptr,
+ size_t *n,
+@@ -234,7 +234,7 @@ test_report_parse (test_report_t *report,
+ * as needed. These aren't necessary full-fledged general purpose
+ * implementations. They just get the job done for our purposes.
+ */
+-#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
++#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+ #define POORMANS_GETLINE_BUFFER_SIZE (65536)
+ static ssize_t
+ getline (char **lineptr,
+diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
+index ff22882..b3a4679 100644
+--- a/perf/cairo-perf-trace.c
++++ perf/cairo-perf-trace.c
+@@ -527,7 +527,7 @@ usage (const char *argv0)
+ argv0, argv0);
+ }
+
+-#ifndef __USE_GNU
++#if !defined __USE_GNU && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+ #define POORMANS_GETLINE_BUFFER_SIZE (65536)
+ static ssize_t
+ getline (char **lineptr,
+diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
+index f529fc9..1e57c39 100644
+--- a/src/cairo-quartz-font.c
++++ src/cairo-quartz-font.c
+@@ -802,7 +802,7 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font)
+ return ffont->cgFont;
+ }
+
+-#ifndef __LP64__
++#if !defined __LP64__ && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+ /*
+ * compat with old ATSUI backend
+ */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110725/33ccd8f7/attachment-0001.html>
More information about the macports-changes
mailing list