Date: Thu, 10 Mar 2011 12:00:18 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r514 - in branches/experimental/www/firefox-devel: . files Message-ID: <201103101200.p2AC0Ie6089791@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Thu Mar 10 12:00:18 2011
New Revision: 514
Log:
- Update to 4.0rc1
- Switch back to cairo from ports [1]
Submitted by: Anonymous <swell.k AT gmail.com> [1]
Deleted:
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 Sun Mar 6 19:50:53 2011 (r513)
+++ branches/experimental/www/firefox-devel/Makefile Thu Mar 10 12:00:18 2011 (r514)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 4.0b12
+DISTVERSION= 4.0rc1
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 -cairo
+USE_MOZILLA= -png -nss -dbm -jpeg -xft -nspr
MOZ_TOOLKIT= cairo-gtk2
GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
lib/${MOZILLA}/include lib/${MOZILLA}/lib
@@ -55,7 +55,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKSRC}-central
+WRKSRC:= ${WRKSRC}-2.0
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
Modified: branches/experimental/www/firefox-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo Sun Mar 6 19:50:53 2011 (r513)
+++ branches/experimental/www/firefox-devel/distinfo Thu Mar 10 12:00:18 2011 (r514)
@@ -1,2 +1,2 @@
-SHA256 (firefox-4.0b12.source.tar.bz2) = 99e7f17d62d92d37aee850bdf7dfdc8572254e4b6c3c8b8f51143df06f2a04d9
-SIZE (firefox-4.0b12.source.tar.bz2) = 65978883
+SHA256 (firefox-4.0rc1.source.tar.bz2) = 8bae4af5d364c6caa624ad106f532f046f23e6187281cf87d8d4ed5d899f100f
+SIZE (firefox-4.0rc1.source.tar.bz2) = 66026659
Deleted: branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp Thu Mar 10 12:00:18 2011 (r513)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,36 +0,0 @@
-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
- }
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103101200.p2AC0Ie6089791>