[75122] trunk/dports/www/firefox-x11-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 15 14:08:40 PST 2011
Revision: 75122
http://trac.macports.org/changeset/75122
Author: jeremyhu at macports.org
Date: 2011-01-15 14:08:33 -0800 (Sat, 15 Jan 2011)
Log Message:
-----------
firefox-x11-devel: Bump to 4.0b9 and build more bits internally for +internal_dependencies
Modified Paths:
--------------
trunk/dports/www/firefox-x11-devel/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11-devel/files/PR-623797.patch
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2011-01-15 22:08:16 UTC (rev 75121)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2011-01-15 22:08:33 UTC (rev 75122)
@@ -7,7 +7,7 @@
name firefox-x11-devel
set component firefox
categories www x11
-version 4.0b8
+version 4.0b9
platforms darwin
maintainers jeremyhu openmaintainer
description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -26,9 +26,9 @@
use_bzip2 yes
-checksums md5 665ffbf8571e713d5da8f98e3d971e9d \
- sha1 40ba6915d736d69e3bcc64365002eedf4a02c8d3 \
- rmd160 b2d2faed1a3b71a1e0a605e66dbf63df0180b8c3
+checksums md5 be58ef0be58cfa3d1efda63bec41fc25 \
+ sha1 4de79608d75098d8de86902f83e846747a3c5ce3 \
+ rmd160 aedf962bb9e3748d2212b26de83a75df30e04bf4
worksrcdir mozilla-central
@@ -157,17 +157,25 @@
--with-system-nss \
--with-nss-prefix=${prefix} \
--with-system-libxul \
- --with-libxul-sdk=${prefix}/lib/xulrunner-devel
+ --with-libxul-sdk=${prefix}/lib/xulrunner-devel \
+ --with-system-bzip2=${prefix} \
+ --with-system-jpeg=${prefix} \
+ --with-system-zlib=${prefix} \
+ --enable-system-lcms \
+ --enable-system-cairo \
+ --enable-system-sqlite
configure.args-append \
- --enable-libxul
+ --enable-libxul \
+ --disable-system-lcms \
+ --disable-system-cairo \
+ --disable-system-sqlite
depends_lib-delete \
port:xulrunner-devel
depends_lib-append \
port:heimdal \
- port:lcms \
port:gconf \
port:esound \
port:libcanberra \
@@ -182,12 +190,13 @@
lib/libcanberra.dylib \
lib/libgconf-2.dylib \
lib/libgtk-x11-2.0.dylib \
- lib/liblcms.dylib \
lib/libnotify.dylib \
lib/libXt.dylib
}
-patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
+# plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370
+# PR-623797.patch : #ifdef out features not in mainline cairo when building with system cairo
+patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch PR-623797.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
Added: trunk/dports/www/firefox-x11-devel/files/PR-623797.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/PR-623797.patch (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/PR-623797.patch 2011-01-15 22:08:33 UTC (rev 75122)
@@ -0,0 +1,128 @@
+work around new features that are not avaliable in system-cairo on linux
+(romaxa's patch with modification for return failure with <gcc-4.5)
+
+diff --git a/config/system-headers b/config/system-headers
+--- config/system-headers
++++ config/system-headers
+@@ -81,16 +81,17 @@ pixman.h
+ cairo.h
+ cairo-atsui.h
+ cairo-beos.h
+ cairo-ft.h
+ cairo-glitz.h
+ cairo-os2.h
+ cairo-pdf.h
+ cairo-ps.h
++cairo-tee.h
+ cairo-quartz.h
+ cairo-win32.h
+ cairo-xlib.h
+ cairo-xlib-xrender.h
+ cairo-directfb.h
+ cairo-qpainter.h
+ #endif
+ dfiff.h
+diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
+--- gfx/thebes/gfxASurface.cpp
++++ gfx/thebes/gfxASurface.cpp
+@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
+
+ mSurface = surface;
+ mSurfaceValid = PR_TRUE;
+
+ if (existingSurface) {
+ mFloatingRefs = 0;
+ } else {
+ mFloatingRefs = 1;
++#ifdef MOZ_TREE_CAIRO
+ if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) {
+ cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
+ }
++#endif
+ }
+ }
+
+ gfxASurface::gfxSurfaceType
+ gfxASurface::GetType() const
+ {
+ if (!mSurfaceValid)
+ return (gfxSurfaceType)-1;
+@@ -432,26 +434,32 @@ gfxASurface::FormatFromContent(gfxASurfa
+ }
+ }
+
+ void
+ gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
+ {
+ if (!mSurfaceValid)
+ return;
++#ifdef MOZ_TREE_CAIRO
+ cairo_surface_set_subpixel_antialiasing(mSurface,
+ aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
++#endif
+ }
+
+ PRBool
+ gfxASurface::GetSubpixelAntialiasingEnabled()
+ {
+ if (!mSurfaceValid)
+ return PR_FALSE;
++#ifdef MOZ_TREE_CAIRO
+ return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
++#else
++ return PR_TRUE;
++#endif
+ }
+
+ PRInt32
+ gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
+ {
+ switch (format) {
+ case ImageFormatARGB32:
+ case ImageFormatRGB24:
+diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
+--- gfx/thebes/gfxTeeSurface.cpp
++++ gfx/thebes/gfxTeeSurface.cpp
+@@ -32,17 +32,21 @@
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+ #include "gfxTeeSurface.h"
+
++#ifdef MOZ_TREE_CAIRO
+ #include "cairo.h"
++#else
++#include "cairo-tee.h"
++#endif
+
+ gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
+ {
+ Init(csurf, PR_TRUE);
+ }
+
+ gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
+ {
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -82,16 +82,17 @@ cairo.h
+ cairo-atsui.h
+ cairo-beos.h
+ cairo-ft.h
+ cairo-glitz.h
+ cairo-os2.h
+ cairo-pdf.h
+ cairo-ps.h
+ cairo-quartz.h
++cairo-tee.h
+ cairo-win32.h
+ cairo-xlib.h
+ cairo-xlib-xrender.h
+ cairo-directfb.h
+ cairo-qpainter.h
+ #endif
+ dfiff.h
+ exception
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110115/c30acbb4/attachment.html>
More information about the macports-changes
mailing list