[76956] trunk/dports/devel/xulrunner-devel

[jeremyhu at macports.org]

Revision: 76956
          http://trac.macports.org/changeset/76956
Author:   jeremyhu at macports.org
Date:     2011-03-15 01:41:17 -0700 (Tue, 15 Mar 2011)
Log Message:
-----------
xulrunner-devel: Bump to 2.0rc1

Modified Paths:
--------------
    trunk/dports/devel/xulrunner-devel/Portfile

Removed Paths:
-------------
    trunk/dports/devel/xulrunner-devel/files/PR-623797.patch

Modified: trunk/dports/devel/xulrunner-devel/Portfile
===================================================================
--- trunk/dports/devel/xulrunner-devel/Portfile	2011-03-15 08:37:31 UTC (rev 76955)
+++ trunk/dports/devel/xulrunner-devel/Portfile	2011-03-15 08:41:17 UTC (rev 76956)
@@ -7,8 +7,8 @@
 name            xulrunner-devel
 set component	xulrunner
 categories      devel
-version		2.0b11
-set ff_version  4.0b11
+version		2.0rc1
+set ff_version  4.0rc1
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's runtime package that can be used to bootstrap XUL+XPCOM applications
@@ -29,11 +29,11 @@
 
 use_bzip2       yes
 
-checksums           md5     a52b8f4bb98f158ef0639db59dd39bce \
-                    sha1    69ebf3f4fd01cf33527a0a20a908d5a81076f8b1 \
-                    rmd160  ffcf2113c83756a5aab30b9ba08e11292e980d3e
+checksums           md5     511828dcc226f38602c6c67bd192ef40 \
+                    sha1    dcfb222de8f5470de9925507b6844d1e85dc0019 \
+                    rmd160  619c7e258a682f47ff9b044f5e4bc6e138b7d1c7
 
-worksrcdir      mozilla-central
+worksrcdir      mozilla-2.0
 
 depends_build \
 	port:findutils \
@@ -201,8 +201,7 @@
 }
 
 # 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
+patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857

Deleted: trunk/dports/devel/xulrunner-devel/files/PR-623797.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/PR-623797.patch	2011-03-15 08:37:31 UTC (rev 76955)
+++ trunk/dports/devel/xulrunner-devel/files/PR-623797.patch	2011-03-15 08:41:17 UTC (rev 76956)
@@ -1,128 +0,0 @@
-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/20110315/b8935c27/attachment.html>