Update to 3.0.a8

firefox-config and all pkg-config files are gone?


git-svn-id: svn://creme-brulee.marcuscom.com/ports-experimental/trunk@17373 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 195 insertions, 230 deletions

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 9b2bc28..41b188c 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -5,7 +5,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-experimental/Mk/bsd.gecko.mk,v 1.3 2007/09/26 15:09:40 ahze Exp $
+#   $MCom: ports-experimental/Mk/bsd.gecko.mk,v 1.4 2007/09/26 15:16:44 ahze Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -298,7 +298,7 @@ cairo_LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 cairo_EXTRACT_AFTER_ARGS=	--exclude mozilla/gfx/cairo
 
 jpeg_LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE
+jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 jpeg_EXTRACT_AFTER_ARGS=	--exclude mozilla/jpeg
 
 nspr_LIB_DEPENDS=	nspr4:${PORTSDIR}/devel/nspr
@@ -313,12 +313,18 @@ png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 xft_LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 zip_DEPENDS=		zip:${PORTSDIR}/archivers/zip
 
+.for use in ${USE_MOZILLA}
+${use:S/-/_WITHOUT_/}=	${TRUE}
+.endfor
+
 .for dep in ${_ALL_DEPENDS}
+.if !defined(_WITHOUT_${dep})
 BUILD_DEPENDS+=	${${dep}_DEPENDS}
 LIB_DEPENDS+=	${${dep}_LIB_DEPENDS}
 RUN_DEPENDS+=	${${dep}_DEPENDS}
 MOZ_OPTIONS+=	${${dep}_MOZ_OPTIONS}
 EXTRACT_AFTER_ARGS+=	${${dep}_EXTRACT_AFTER_ARGS}
+.endif
 .endfor
 
 # Standard options from README
@@ -434,7 +440,7 @@ LIB_BZ2=	-lbz2_p
 LIB_BZ2=	-lbz2
 .endif
 
-.else
+.else # bsd.port.post.mk
 
 post-patch: gecko-post-patch gecko-moz-pis-patch
 
@@ -516,7 +522,7 @@ post-build: gecko-post-build
 
 gecko-post-build:
 	@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \
-		${WRKSRC}/build/unix/*.pc
+		${WRKSRC}/build/unix/*.pc || ${TRUE}
 
 pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
 
@@ -533,19 +539,19 @@ gecko-pre-install:
 		${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
 .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
 	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}
+.if exists(${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config)
 	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config
+.endif
 .for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
 	${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \
 	${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc
 .endfor
 	@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
 		s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
-		${FAKEDIR}/bin/${MOZILLA} \
-		${FAKEDIR}/bin/${MOZILLA}-config
+		${FAKEDIR}/bin/${MOZILLA}*
 .endif
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/${MOZILLA}	\
-		${FAKEDIR}/bin/${MOZILLA}-config
+		${FAKEDIR}/bin/${MOZILLA}*
 	${RM} -f ${FAKEDIR}/bin/*.bak
 .endif
 
@@ -561,7 +567,7 @@ gecko-create-plist:
 	${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/${BROWSER_PLUGINS_DIR} 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${MKDIR} ${FAKEDIR}/libdata
-	${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/
+	${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE}
 	${RM} -f ${FAKEDIR}/lib/pkgconfig
 .for dir in ${MOZILLA_PLIST_DIRS}
 	@cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 646e469..3b51243 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -3,22 +3,24 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.4 2007/09/19 23:49:33 ahze Exp $
+#   $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.5 2007/09/20 18:09:32 ahze Exp $
 
 PORTNAME=	firefox
-DISTVERSION=	3.0.a7
+DISTVERSION=	3.0.a8
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/granparadiso/alpha7/source/
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/granparadiso/alpha8/source/
 #MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	granparadiso-alpha7-source
+DISTNAME=	granparadiso-alpha8-source
 #DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 USE_GECKO=	gecko
+MOZ_PKGCONFIG_FILES=	# empty
+USE_MOZILLA=	-png
 MOZILLA_NAME=	Firefox-${MOZILLA_SUFX}
 MOZILLA_SUFX=	-devel
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
@@ -37,7 +39,6 @@ NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.xpm
 FIREFOX_ICON_SRC=	${PREFIX}/lib/firefox-devel/chrome/icons/default/default.xpm
-MOZ_PKGCONFIG_FILES=	${MOZILLA}-js ${MOZILLA}-xpcom ${MOZILLA}-plugin
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-system-cairo	\
 		--enable-official-branding \
@@ -70,7 +71,7 @@ post-patch:
 .endfor
 
 port-pre-install:
-	${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
+#	${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index 1340a04..436ca85 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (granparadiso-alpha7-source.tar.bz2) = cd692127775b55f5e64685ef49788c1c
-SHA256 (granparadiso-alpha7-source.tar.bz2) = 91369eff2bba6b0ef3a9b5a40a1585b27f66a670f1a96299852f2595bd96f209
-SIZE (granparadiso-alpha7-source.tar.bz2) = 35319889
+MD5 (granparadiso-alpha8-source.tar.bz2) = ffcf7c99940fc3a304f9c06890741497
+SHA256 (granparadiso-alpha8-source.tar.bz2) = d06eae776376796bacb85f4b36d140d566d0ad8b3d1161ae4d60f53c64e1c27a
+SIZE (granparadiso-alpha8-source.tar.bz2) = 34327675
diff --git a/www/firefox-devel/files/patch-bugzilla296818 b/www/firefox-devel/files/patch-bugzilla296818
index a7f22b4..f46ef75 100644
--- a/www/firefox-devel/files/patch-bugzilla296818
+++ b/www/firefox-devel/files/patch-bugzilla296818
@@ -578,156 +578,6 @@ index 16b9fd8..48431e4 100644
      /* we're done dude */
      break;
    }
-diff --git modules/libpr0n/decoders/png/nsPNGDecoder.cpp modules/libpr0n/decoders/png/nsPNGDecoder.cpp
-index 85f0216..15abc9f 100644
---- modules/libpr0n/decoders/png/nsPNGDecoder.cpp
-+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp
-@@ -23,6 +23,7 @@
-  * Contributor(s):
-  *   Stuart Parmenter <stuart@mozilla.com>
-  *   Andrew Smith
-+ *   Federico Mena-Quintero <federico@novell.com>
-  *
-  * Alternatively, the contents of this file may be used under the terms of
-  * either the GNU General Public License Version 2 or later (the "GPL"), or
-@@ -73,6 +74,7 @@ static void PNGAPI warning_callback(png_structp png_ptr, png_const_charp warning
- 
- #ifdef PR_LOGGING
- PRLogModuleInfo *gPNGLog = PR_NewLogModule("PNGDecoder");
-+static PRLogModuleInfo *gPNGDecoderAccountingLog = PR_NewLogModule ("PNGDecoderAccounting");
- #endif
- 
- NS_IMPL_ISUPPORTS1(nsPNGDecoder, imgIDecoder)
-@@ -119,6 +121,11 @@ void nsPNGDecoder::CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
-   
-   if (mObserver)
-     mObserver->OnStartFrame(nsnull, mFrame);
-+
-+  PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+          ("PNGDecoderAccounting: nsPNGDecoder::CreateFrame -- created image frame with %dx%d pixels in container %p",
-+           width, height,
-+           mImage.get ()));
- }
- 
- // set timeout and frame disposal method for the current frame
-@@ -213,9 +220,25 @@ NS_IMETHODIMP nsPNGDecoder::Init(imgILoad *aLoad)
- /* void close (); */
- NS_IMETHODIMP nsPNGDecoder::Close()
- {
-+  nsresult result;
-+
-   if (mPNG)
-     png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
- 
-+  result = mImage->RestoreDataDone ();
-+  if (NS_FAILED (result)) {
-+    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+            ("PNGDecoderAccounting: nsPNGDecoder::Close(): failure in RestoreDataDone() for image container %p",
-+             mImage.get ()));
-+
-+    mError = PR_TRUE;
-+    return result;
-+  }
-+
-+  PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+          ("PNGDecoderAccounting: nsPNGDecoder::Close(): image container %p is now with RestoreDataDone",
-+           mImage.get ()));
-+
-   return NS_OK;
- }
- 
-@@ -234,6 +257,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
-                              PRUint32 *writeCount)
- {
-   nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(closure);
-+  nsresult result;
- 
-   if (decoder->mError) {
-     *writeCount = 0;
-@@ -248,10 +272,24 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
-     *writeCount = 0;
-     return NS_ERROR_FAILURE;
-   }
--
-   png_process_data(decoder->mPNG, decoder->mInfo,
-                    reinterpret_cast<unsigned char *>(const_cast<char *>(fromRawSegment)), count);
- 
-+  result = decoder->mImage->AddRestoreData ((char *) fromRawSegment, count);
-+  if (NS_FAILED (result)) {
-+    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+            ("PNGDecoderAccounting: ReadDataOut(): failed to add restore data to image container %p",
-+             decoder->mImage.get ()));
-+
-+    decoder->mError = PR_TRUE;
-+    *writeCount = 0;
-+    return result;
-+  }
-+
-+  PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+          ("PNGDecoderAccounting: ReadDataOut(): Added restore data to image container %p",
-+           decoder->mImage.get ()));
-+
-   *writeCount = count;
-   return NS_OK;
- }
-@@ -525,13 +563,41 @@ info_callback(png_structp png_ptr, png_infop info_ptr)
-   if (decoder->mObserver)
-     decoder->mObserver->OnStartDecode(nsnull);
- 
--  decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
--  if (!decoder->mImage)
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+  /* The image container may already exist if it is reloading itself from us.
-+   * Check that it has the same width/height; otherwise create a new container.
-+   */
-+  decoder->mImageLoad->GetImage (getter_AddRefs (decoder->mImage));
-+  if (decoder->mImage) {
-+    PRInt32 container_width, container_height;
-+
-+    decoder->mImage->GetWidth (&container_width);
-+    decoder->mImage->GetHeight (&container_height);
- 
--  decoder->mImageLoad->SetImage(decoder->mImage);
-+    if (container_width != width || container_height != height)
-+      decoder->mImage = nsnull;
-+  }
- 
--  decoder->mImage->Init(width, height, decoder->mObserver);
-+  if (!decoder->mImage) {
-+    decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
-+    if (!decoder->mImage)
-+      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+
-+    decoder->mImageLoad->SetImage(decoder->mImage);
-+
-+    decoder->mImage->Init(width, height, decoder->mObserver);
-+
-+    /* FIXME: is this MIME type always right for this decoder? */
-+    if (NS_FAILED (decoder->mImage->SetDiscardable ("image/png"))) {
-+      PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+              ("PNGDecoderAccounting: info_callback(): failed to set image container %p as discardable",
-+               decoder->mImage.get ()));
-+      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    }
-+
-+    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
-+            ("PNGDecoderAccounting: info_callback(): set image container %p as discardable",
-+             decoder->mImage.get ()));
-+  }
- 
-   if (decoder->mObserver)
-     decoder->mObserver->OnStartContainer(nsnull, decoder->mImage);
-@@ -757,7 +823,7 @@ end_callback(png_structp png_ptr, png_infop info_ptr)
-   }
-   
-   decoder->mImage->DecodingComplete();
--  
-+
-   if (decoder->mObserver) {
-     if (!(decoder->apngFlags & FRAME_HIDDEN))
-       decoder->mObserver->OnStopFrame(nsnull, decoder->mFrame);
-diff --git modules/libpr0n/public/imgIContainer.idl modules/libpr0n/public/imgIContainer.idl
-index fc42335..524af96 100644
 --- modules/libpr0n/public/imgIContainer.idl
 +++ modules/libpr0n/public/imgIContainer.idl
 @@ -22,6 +22,7 @@
@@ -1619,3 +1469,150 @@ index 3db7034..aa56939 100644
  };
  
  #endif /* __imgContainer_h__ */
+--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig	2007-09-10 16:01:18.000000000 -0400
++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2007-09-26 13:39:26.000000000 -0400
+@@ -23,6 +23,7 @@
+  * Contributor(s):
+  *   Stuart Parmenter <stuart@mozilla.com>
+  *   Andrew Smith
++ *   Federico Mena-Quintero <federico@novell.com>
+  *
+  * Alternatively, the contents of this file may be used under the terms of
+  * either the GNU General Public License Version 2 or later (the "GPL"), or
+@@ -73,6 +74,7 @@
+ 
+ #ifdef PR_LOGGING
+ PRLogModuleInfo *gPNGLog = PR_NewLogModule("PNGDecoder");
++static PRLogModuleInfo *gPNGDecoderAccountingLog = PR_NewLogModule ("PNGDecoderAccounting");
+ #endif
+ 
+ NS_IMPL_ISUPPORTS1(nsPNGDecoder, imgIDecoder)
+@@ -119,6 +121,12 @@
+   
+   if (mObserver)
+     mObserver->OnStartFrame(nsnull, mFrame);
++ 
++    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++           ("PNGDecoderAccounting: nsPNGDecoder::CreateFrame -- created image frame with %dx%d pixels in container %p",
++            width, height,
++            mImage.get ()));
++
+ 
+   mFrameHasNoAlpha = PR_TRUE;
+ }
+@@ -215,9 +223,25 @@
+ /* void close (); */
+ NS_IMETHODIMP nsPNGDecoder::Close()
+ {
++  nsresult result;
++
+   if (mPNG)
+     png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
+ 
++  result = mImage->RestoreDataDone ();
++  if (NS_FAILED (result)) {
++    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++            ("PNGDecoderAccounting: nsPNGDecoder::Close(): failure in RestoreDataDone() for image container %p",
++             mImage.get ()));
++
++    mError = PR_TRUE;
++    return result;
++  }
++
++  PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++          ("PNGDecoderAccounting: nsPNGDecoder::Close(): image container %p is now with RestoreDataDone",
++           mImage.get ()));
++
+   return NS_OK;
+ }
+ 
+@@ -236,6 +260,7 @@
+                              PRUint32 *writeCount)
+ {
+   nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(closure);
++  nsresult result;
+ 
+   if (decoder->mError) {
+     *writeCount = 0;
+@@ -250,10 +275,24 @@
+     *writeCount = 0;
+     return NS_ERROR_FAILURE;
+   }
+-
+   png_process_data(decoder->mPNG, decoder->mInfo,
+                    reinterpret_cast<unsigned char *>(const_cast<char *>(fromRawSegment)), count);
+ 
++  result = decoder->mImage->AddRestoreData ((char *) fromRawSegment, count);
++  if (NS_FAILED (result)) {
++    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++            ("PNGDecoderAccounting: ReadDataOut(): failed to add restore data to image container %p",
++             decoder->mImage.get ()));
++
++    decoder->mError = PR_TRUE;
++    *writeCount = 0;
++    return result;
++  }
++
++  PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++          ("PNGDecoderAccounting: ReadDataOut(): Added restore data to image container %p",
++           decoder->mImage.get ()));
++
+   *writeCount = count;
+   return NS_OK;
+ }
+@@ -527,13 +566,41 @@
+   if (decoder->mObserver)
+     decoder->mObserver->OnStartDecode(nsnull);
+ 
+-  decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
+-  if (!decoder->mImage)
+-    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++  /* The image container may already exist if it is reloading itself from us.
++   * Check that it has the same width/height; otherwise create a new container.
++   */
++  decoder->mImageLoad->GetImage (getter_AddRefs (decoder->mImage));
++  if (decoder->mImage) {
++    PRInt32 container_width, container_height;
+ 
+-  decoder->mImageLoad->SetImage(decoder->mImage);
++    decoder->mImage->GetWidth (&container_width);
++    decoder->mImage->GetHeight (&container_height);
+ 
+-  decoder->mImage->Init(width, height, decoder->mObserver);
++    if (container_width != width || container_height != height)
++      decoder->mImage = nsnull;
++  }
++
++  if (!decoder->mImage) {
++    decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
++    if (!decoder->mImage)
++      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++
++    decoder->mImageLoad->SetImage(decoder->mImage);
++
++    decoder->mImage->Init(width, height, decoder->mObserver);
++
++    /* FIXME: is this MIME type always right for this decoder? */
++    if (NS_FAILED (decoder->mImage->SetDiscardable ("image/png"))) {
++      PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++              ("PNGDecoderAccounting: info_callback(): failed to set image container %p as discardable",
++               decoder->mImage.get ()));
++      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++    }
++
++    PR_LOG (gPNGDecoderAccountingLog, PR_LOG_DEBUG,
++            ("PNGDecoderAccounting: info_callback(): set image container %p as discardable",
++             decoder->mImage.get ()));
++  }
+ 
+   if (decoder->mObserver)
+     decoder->mObserver->OnStartContainer(nsnull, decoder->mImage);
+@@ -775,7 +842,7 @@
+   }
+   
+   decoder->mImage->DecodingComplete();
+-  
++
+   if (decoder->mObserver) {
+     if (!(decoder->apngFlags & FRAME_HIDDEN))
+       decoder->mObserver->OnStopFrame(nsnull, decoder->mFrame);
diff --git a/www/firefox-devel/files/patch-config_autoconf.mk.in b/www/firefox-devel/files/patch-config_autoconf.mk.in
index 29fe7f8..b39d9ba 100644
--- a/www/firefox-devel/files/patch-config_autoconf.mk.in
+++ b/www/firefox-devel/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
+--- config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
++++ config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
+@@ -58,14 +58,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -9,10 +9,13 @@
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/%%MOZILLA%%
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/%%MOZILLA%%
++sdkdir		= $(libdir)/%%MOZILLA%%
  
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/www/firefox-devel/files/patch-modules_libpref_src_init_all.js b/www/firefox-devel/files/patch-modules_libpref_src_init_all.js
deleted file mode 100644
index 1700380..0000000
--- a/www/firefox-devel/files/patch-modules_libpref_src_init_all.js
+++ /dev/null
@@ -1,53 +0,0 @@
---- modules/libpref/src/init/all.js.orig	Mon Feb 13 22:58:15 2006
-+++ modules/libpref/src/init/all.js	Tue May  2 00:32:55 2006
-@@ -1883,33 +1883,33 @@
- 
- // th
- 
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
- 
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
- 
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
-+pref("font.name.serif.x-central-euro", "serif");
-+pref("font.name.sans-serif.x-central-euro", "sans-serif");
-+pref("font.name.monospace.x-central-euro", "monospace");
- 
- pref("font.name.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
- 
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
--
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
--
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
-+pref("font.name.serif.x-unicode", "serif");
-+pref("font.name.sans-serif.x-unicode", "sans-serif");
-+pref("font.name.monospace.x-unicode", "monospace");
-+
-+pref("font.name.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
-+
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
- 
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
diff --git a/www/firefox-devel/files/patch-toolkit_mozapps_installer_packager.mk b/www/firefox-devel/files/patch-toolkit_mozapps_installer_packager.mk
new file mode 100644
index 0000000..635c3c7
--- /dev/null
+++ b/www/firefox-devel/files/patch-toolkit_mozapps_installer_packager.mk
@@ -0,0 +1,11 @@
+--- toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
++++ toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
+@@ -409,7 +409,7 @@
+ 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+-	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff --git a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
index 51edeb9..cf4ffb0 100644
--- a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/firefox-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@@ -4,7 +4,7 @@
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
-+ifeq (amd64,$(OS_TEST))
++ifeq (x86_64,$(OS_TEST))
 +CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
 +endif
  endif