[SVN-Commit] r495 - in branches/experimental/www/firefox-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sat Feb 26 11:06:20 2011
New Revision: 495

Log:
- Update to 4.0 Beta 12
- Fall back to bundled cairo until someone has time to check why configure
  fails here:
  checking for cairo-tee >= 1.10... Package cairo-tee was not found in the pkg-config search path.

Deleted:
   branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp
Modified:
   branches/experimental/www/firefox-devel/Makefile
   branches/experimental/www/firefox-devel/distinfo
   branches/experimental/www/firefox-devel/files/patch-build-pgo-profileserver.py

Modified: branches/experimental/www/firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile	Sun Feb 20 16:56:54 2011	(r494)
+++ branches/experimental/www/firefox-devel/Makefile	Sat Feb 26 11:06:20 2011	(r495)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	4.0b11
+DISTVERSION=	4.0b12
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -22,7 +22,7 @@
 LATEST_LINK=	firefox-devel
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-png -nss -dbm -jpeg -xft -nspr
+USE_MOZILLA=	-png -nss -dbm -jpeg -xft -nspr -cairo
 MOZ_TOOLKIT=	cairo-gtk2
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib

Modified: branches/experimental/www/firefox-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo	Sun Feb 20 16:56:54 2011	(r494)
+++ branches/experimental/www/firefox-devel/distinfo	Sat Feb 26 11:06:20 2011	(r495)
@@ -1,2 +1,2 @@
-SHA256 (firefox-4.0b11.source.tar.bz2) = 88b6e24123dbacf9edf49617627801aa2149331cf61459701376d3640dd3ba46
-SIZE (firefox-4.0b11.source.tar.bz2) = 65431451
+SHA256 (firefox-4.0b12.source.tar.bz2) = 99e7f17d62d92d37aee850bdf7dfdc8572254e4b6c3c8b8f51143df06f2a04d9
+SIZE (firefox-4.0b12.source.tar.bz2) = 65978883

Modified: branches/experimental/www/firefox-devel/files/patch-build-pgo-profileserver.py
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-build-pgo-profileserver.py	Sun Feb 20 16:56:54 2011	(r494)
+++ branches/experimental/www/firefox-devel/files/patch-build-pgo-profileserver.py	Sat Feb 26 11:06:20 2011	(r495)
@@ -1,21 +1,6 @@
---- build/pgo/profileserver.py.orig	2011-02-03 21:11:40.000000000 +0100
-+++ build/pgo/profileserver.py	2011-02-09 22:44:23.000000000 +0100
-@@ -46,11 +46,13 @@
- import sys
- import shutil
- from datetime import datetime
-+
-+SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
-+sys.path.insert(0, SCRIPT_DIR)
- from automation import Automation
- from automationutils import getDebuggerInfo, addCommonOptions
- 
- PORT = 8888
--SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
- PROFILE_DIRECTORY = os.path.abspath(os.path.join(SCRIPT_DIR, "./pgoprofile"))
- MOZ_JAR_LOG_DIR = os.path.abspath(os.path.join(os.path.join(os.getenv("OBJDIR"), "dist"), "jarlog"))
- os.chdir(SCRIPT_DIR)
-@@ -75,13 +77,13 @@
+--- build/pgo/profileserver.py.orig	2011-02-24 21:49:47.000000000 +0100
++++ build/pgo/profileserver.py	2011-02-24 21:50:30.000000000 +0100
+@@ -77,13 +77,13 @@
    t.setDaemon(True) # don't hang on exit
    t.start()
    

Deleted: branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxASurface.cpp	Sat Feb 26 11:06:20 2011	(r494)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,32 +0,0 @@
-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
- }
-