[91263] trunk/dports/graphics/cairo
Jeremy Huddleston
jeremyhu at apple.com
Thu Mar 29 12:28:47 PDT 2012
I'm configured -universal, but because I bring in wine, cairo is brought in +universal.
It looks like you need to add more to cairo's archcheck.files and depends_lib:
ld: warning: ignoring file /opt/local/lib/libpoppler-glib.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libpoppler.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libcurl.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libidn.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libopenjpeg.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/liblcms2.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/librsvg-2.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libcroco-0.6.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: dylibs with same install name: /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_graphics_cairo/cairo/work/cairo-1.12.0-i386/src/.libs/libcairo.dylib and /opt/local/lib/libcairo.dylib
ld: warning: ignoring file /opt/local/lib/libspectre.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
ld: warning: ignoring file /opt/local/lib/libgs.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
On Mar 27, 2012, at 6:27 PM, ryandesign at macports.org wrote:
> Revision: 91263
> https://trac.macports.org/changeset/91263
> Author: ryandesign at macports.org
> Date: 2012-03-27 18:27:18 -0700 (Tue, 27 Mar 2012)
> Log Message:
> -----------
> cairo: update to 1.12.0
>
> Modified Paths:
> --------------
> trunk/dports/graphics/cairo/Portfile
> trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff
>
> Removed Paths:
> -------------
> trunk/dports/graphics/cairo/files/lion_fonts.diff
>
> Modified: trunk/dports/graphics/cairo/Portfile
> ===================================================================
> --- trunk/dports/graphics/cairo/Portfile 2012-03-27 23:13:31 UTC (rev 91262)
> +++ trunk/dports/graphics/cairo/Portfile 2012-03-28 01:27:18 UTC (rev 91263)
> @@ -9,8 +9,7 @@
> name cairo
> conflicts cairo-devel
> set my_name cairo
> -version 1.10.2
> -revision 4
> +version 1.12.0
> categories graphics
> maintainers ryandesign
> license {LGPL-2.1 MPL-1.1}
> @@ -28,8 +27,8 @@
> advantage of display hardware acceleration when \
> available (e.g. through the X Render Extension).
>
> -checksums sha1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e \
> - rmd160 8c8de00120398fe2b3a60a08ff59a464b2eebf47
> +checksums rmd160 043641375a4e41dd303fc9c496f0a3c352c5fd84 \
> + sha256 af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
>
> depends_build port:pkgconfig
>
> @@ -52,7 +51,7 @@
> minimum_xcodeversions {8 2.4.1}
>
> pre-configure {
> - set pixman_minimum_version 0.18.4
> + set pixman_minimum_version 0.20.2
> set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
> if {[vercmp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
> ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
> @@ -103,10 +102,6 @@
> 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/files/lion_fonts.diff
> ===================================================================
> --- trunk/dports/graphics/cairo/files/lion_fonts.diff 2012-03-27 23:13:31 UTC (rev 91262)
> +++ trunk/dports/graphics/cairo/files/lion_fonts.diff 2012-03-28 01:27:18 UTC (rev 91263)
> @@ -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
> - */
>
> Modified: trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff
> ===================================================================
> --- trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff 2012-03-27 23:13:31 UTC (rev 91262)
> +++ trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff 2012-03-28 01:27:18 UTC (rev 91263)
> @@ -1,6 +1,6 @@
> ---- configure.orig 2012-01-09 03:44:48.000000000 +0100
> -+++ configure 2012-01-09 03:45:01.000000000 +0100
> -@@ -17236,7 +17236,7 @@
> +--- configure.orig 2012-03-12 04:26:22.000000000 -0500
> ++++ configure 2012-03-12 08:44:05.000000000 -0500
> +@@ -17945,7 +17945,7 @@
> MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
> -erroff=E_ENUM_TYPE_MISMATCH_OP"
>
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> http://lists.macosforge.org/mailman/listinfo.cgi/macports-changes
More information about the macports-dev
mailing list