[email protected] writes:
> 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.
Have you tried to satisfy the dependency?
%%
Index: graphics/cairo/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/cairo/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- graphics/cairo/Makefile 28 Feb 2011 11:38:15 -0000 1.51
+++ graphics/cairo/Makefile 1 Mar 2011 06:12:27 -0000
@@ -28,6 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
+ --enable-tee \
--enable-gobject
USE_GNOME= glib20 gnomehack ltverhack referencehack
USE_AUTOTOOLS= libtool
Index: graphics/cairo/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/graphics/cairo/pkg-plist,v
retrieving revision 1.11
diff -u -p -r1.11 pkg-plist
--- graphics/cairo/pkg-plist 20 Nov 2010 15:36:38 -0000 1.11
+++ graphics/cairo/pkg-plist 14 Jan 2011 08:17:47 -0000
@@ -8,6 +8,7 @@ include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h
include/cairo/cairo-script-interpreter.h
include/cairo/cairo-svg.h
+include/cairo/cairo-tee.h
include/cairo/cairo-version.h
%%XCB%%include/cairo/cairo-xcb.h
%%X11%%include/cairo/cairo-xlib-xrender.h
@@ -39,6 +40,7 @@ libdata/pkgconfig/cairo-pdf.pc
libdata/pkgconfig/cairo-png.pc
libdata/pkgconfig/cairo-ps.pc
libdata/pkgconfig/cairo-svg.pc
+libdata/pkgconfig/cairo-tee.pc
%%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
%%X11%%libdata/pkgconfig/cairo-xlib.pc
Index: www/firefox-devel/Makefile
===================================================================
--- www/firefox-devel/Makefile (revision 498)
+++ www/firefox-devel/Makefile (working copy)
@@ -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
Index: www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp
===================================================================
--- www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp (revision 498)
+++ www/firefox-devel/files/patch-gfx-thebes-gfxTeeSurface.cpp (working copy)
@@ -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
- }
-
%%
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
