[SVN-Commit] r481 - in branches/experimental/www/firefox-devel: .
files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Fri Jan 14 17:38:56 UTC 2011
Author: beat
Date: Fri Jan 14 17:38:48 2011
New Revision: 481
Log:
- Update to 4.0 Beta 9
- Add two patches from Gentoo to fix build with system-cairo [1]
Obtained from: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2d558e6491a0fdcf8e864ffebf386b9ca8e6c792 [1]
Added:
branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp
branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp
Modified:
branches/experimental/www/firefox-devel/Makefile
branches/experimental/www/firefox-devel/distinfo
Modified: branches/experimental/www/firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile Mon Jan 3 12:37:05 2011 (r480)
+++ branches/experimental/www/firefox-devel/Makefile Fri Jan 14 17:38:48 2011 (r481)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 4.0b8
+DISTVERSION= 4.0b9
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: branches/experimental/www/firefox-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo Mon Jan 3 12:37:05 2011 (r480)
+++ branches/experimental/www/firefox-devel/distinfo Fri Jan 14 17:38:48 2011 (r481)
@@ -1,2 +1,2 @@
-SHA256 (firefox-4.0b8.source.tar.bz2) = c3f431d9b8fe03ebc194e90f2e7b2d63379ec755e7023e384c4982601433862f
-SIZE (firefox-4.0b8.source.tar.bz2) = 64222944
+SHA256 (firefox-4.0b9.source.tar.bz2) = 4689f2de319025ec511cfaa4693335fc78a3e674e8077ed932c5c3274f5ac266
+SIZE (firefox-4.0b9.source.tar.bz2) = 64377236
Added: branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp Fri Jan 14 17:38:48 2011 (r481)
@@ -0,0 +1,32 @@
+diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
+--- gfx/thebes/gfxASurface.cpp
++++ gfx/thebes/gfxASurface.cpp
+@@ -222,7 +222,9 @@ gfxASurface::Init(cairo_surface_t* surfa
+ } 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
+ }
+ }
+@@ -438,6 +440,8 @@ gfxASurface::SetSubpixelAntialiasingEnab
+ if (!mSurfaceValid)
+ return;
++#ifdef MOZ_TREE_CAIRO
+ cairo_surface_set_subpixel_antialiasing(mSurface,
+ aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
++#endif
+ }
+
+@@ -447,5 +451,9 @@ gfxASurface::GetSubpixelAntialiasingEnab
+ if (!mSurfaceValid)
+ return PR_FALSE;
++#ifdef MOZ_TREE_CAIRO
+ return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
++#else
++ return PR_FALSE;
++#endif
+ }
+
Added: branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp Fri Jan 14 17:38:48 2011 (r481)
@@ -0,0 +1,36 @@
+diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
+--- gfx/thebes/gfxTeeSurface.cpp
++++ gfx/thebes/gfxTeeSurface.cpp
+@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa
+ gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
+ {
++#ifdef MOZ_TREE_CAIRO
+ NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface");
+ cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface());
+@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface
+ cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface());
+ }
++#endif
+ }
+
+@@ -59,6 +61,8 @@ const gfxIntSize
+ gfxTeeSurface::GetSize() const
+ {
++#ifdef MOZ_TREE_CAIRO
+ nsRefPtr<gfxASurface> master = Wrap(cairo_tee_surface_index(mSurface, 0));
+ return master->GetSize();
++#endif
+ }
+
+@@ -66,4 +70,5 @@ void
+ gfxTeeSurface::GetSurfaces(nsTArray<nsRefPtr<gfxASurface> >* aSurfaces)
+ {
++#ifdef MOZ_TREE_CAIRO
+ for (PRInt32 i = 0; ; ++i) {
+ cairo_surface_t *csurf = cairo_tee_surface_index(mSurface, i);
+@@ -75,3 +80,4 @@ gfxTeeSurface::GetSurfaces(nsTArray<nsRe
+ *elem = Wrap(csurf);
+ }
++#endif
+ }
+
More information about the freebsd-gecko
mailing list