[82863] trunk/dports/www/firefox-x11-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Aug 20 21:50:59 PDT 2011
Revision: 82863
http://trac.macports.org/changeset/82863
Author: jeremyhu at macports.org
Date: 2011-08-20 21:50:59 -0700 (Sat, 20 Aug 2011)
Log Message:
-----------
firefox-x11-devel: Bump to current trunk
Modified Paths:
--------------
trunk/dports/www/firefox-x11-devel/Portfile
trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff
Added Paths:
-----------
trunk/dports/www/firefox-x11-devel/files/egrep.patch
Removed Paths:
-------------
trunk/dports/www/firefox-x11-devel/files/PR-623797.patch
trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2011-08-21 04:20:04 UTC (rev 82862)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2011-08-21 04:50:59 UTC (rev 82863)
@@ -7,7 +7,7 @@
name firefox-x11-devel
set component firefox
categories www x11
-version 5.0.1
+version 9.0_alpha20110820
platforms darwin
maintainers jeremyhu openmaintainer
description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -20,18 +20,12 @@
homepage http://www.mozilla.com/${component}/
-master_sites http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
-distname ${component}-${version}.source
-dist_subdir ${component}
+fetch.type hg
+hg.url http://hg.mozilla.org/mozilla-central
+hg.tag 6dc468c41136
-use_bzip2 yes
+worksrcdir mozilla-central
-checksums md5 6d1f43e402cec84459a3d7f950bd5192 \
- sha1 c93b3513e160d87535a9d61c5e06a6a701e9cd3e \
- rmd160 d80a2d64a4a712e530b6f91661eae41f6d1e491e
-
-worksrcdir mozilla-release
-
depends_build \
port:findutils \
port:pkgconfig \
@@ -163,8 +157,7 @@
--enable-official-branding
}
-# plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370
-patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
+patchfiles patch-dylib_file.diff egrep.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -179,7 +172,8 @@
reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk
# Don't use the system X11
- reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+ reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
+ reinplace "s/libXt.so.6:libXext.so/libXt.dylib:libXext.dylib/" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
# Set the right install_name on the libs
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
@@ -218,8 +212,6 @@
reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
- reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/dom/plugins/PluginModuleChild.cpp
-
reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/qt/nsIdleServiceQt.cpp
reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/qt/nsSound.cpp
@@ -230,6 +222,10 @@
${worksrcpath}/xpcom/build/nsXPCOMPrivate.h
}
+pre-configure {
+ system "cd ${worksrcpath}/js/src && ${autoconf.cmd}"
+}
+
configure.env \
MOZCONFIG="${worksrcpath}/browser/config/mozconfig" \
MOZILLA_FIVE_HOME="${prefix}/lib/${pkg_name}" \
Deleted: trunk/dports/www/firefox-x11-devel/files/PR-623797.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/PR-623797.patch 2011-08-21 04:20:04 UTC (rev 82862)
+++ trunk/dports/www/firefox-x11-devel/files/PR-623797.patch 2011-08-21 04:50:59 UTC (rev 82863)
@@ -1,128 +0,0 @@
-work around new features that are not avaliable in system-cairo on linux
-(romaxa's patch with modification for return failure with <gcc-4.5)
-
-diff --git a/config/system-headers b/config/system-headers
---- config/system-headers
-+++ config/system-headers
-@@ -81,16 +81,17 @@ pixman.h
- cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
-+cairo-tee.h
- cairo-quartz.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
-diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
---- gfx/thebes/gfxASurface.cpp
-+++ gfx/thebes/gfxASurface.cpp
-@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
-
- mSurface = surface;
- mSurfaceValid = PR_TRUE;
-
- if (existingSurface) {
- mFloatingRefs = 0;
- } 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
- }
- }
-
- gfxASurface::gfxSurfaceType
- gfxASurface::GetType() const
- {
- if (!mSurfaceValid)
- return (gfxSurfaceType)-1;
-@@ -432,26 +434,32 @@ gfxASurface::FormatFromContent(gfxASurfa
- }
- }
-
- void
- gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
- {
- if (!mSurfaceValid)
- return;
-+#ifdef MOZ_TREE_CAIRO
- cairo_surface_set_subpixel_antialiasing(mSurface,
- aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-+#endif
- }
-
- PRBool
- gfxASurface::GetSubpixelAntialiasingEnabled()
- {
- if (!mSurfaceValid)
- return PR_FALSE;
-+#ifdef MOZ_TREE_CAIRO
- return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
-+#else
-+ return PR_TRUE;
-+#endif
- }
-
- PRInt32
- gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
- {
- switch (format) {
- case ImageFormatARGB32:
- case ImageFormatRGB24:
-diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
---- gfx/thebes/gfxTeeSurface.cpp
-+++ gfx/thebes/gfxTeeSurface.cpp
-@@ -32,17 +32,21 @@
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
- #include "gfxTeeSurface.h"
-
-+#ifdef MOZ_TREE_CAIRO
- #include "cairo.h"
-+#else
-+#include "cairo-tee.h"
-+#endif
-
- gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
- {
- Init(csurf, PR_TRUE);
- }
-
- gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
- {
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
---- js/src/config/system-headers
-+++ js/src/config/system-headers
-@@ -82,16 +82,17 @@ cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
- cairo-quartz.h
-+cairo-tee.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
- exception
Added: trunk/dports/www/firefox-x11-devel/files/egrep.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/egrep.patch (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/egrep.patch 2011-08-21 04:50:59 UTC (rev 82863)
@@ -0,0 +1,22 @@
+--- configure.in.orig 2011-08-20 20:56:49.000000000 -0700
++++ configure.in 2011-08-20 20:57:24.000000000 -0700
+@@ -9263,19 +9263,7 @@ xpcom/xpcom-config.h
+ xpcom/xpcom-private.h
+ )
+
+-# Hack around an Apple bug that effects the egrep that comes with OS X 10.7.
+-# "arch -arch i386 egrep" always uses the 32-bit Intel part of the egrep fat
+-# binary, even on 64-bit systems. It should work on OS X 10.4.5 and up. We
+-# (apparently) only need this hack when egrep's "pattern" is particularly
+-# long (as in the following code). See bug 655339.
+-case "$host" in
+-*-apple-darwin*)
+- FIXED_EGREP="arch -arch i386 egrep"
+- ;;
+-*)
+ FIXED_EGREP="egrep"
+- ;;
+-esac
+
+ # Save the defines header file before autoconf removes it.
+ # (Do not add AC_DEFINE calls after this line.)
Modified: trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff 2011-08-21 04:20:04 UTC (rev 82862)
+++ trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff 2011-08-21 04:50:59 UTC (rev 82863)
@@ -1,9 +1,9 @@
---- config/config.mk.orig 2008-08-14 03:00:34.000000000 -0700
-+++ config/config.mk 2009-05-25 20:11:09.000000000 -0700
-@@ -704,6 +704,12 @@
- else
- XCODE_PRODUCT_DIR = build
- endif # HAS_XCODE_2_1=1
+--- config/config.mk.orig 2011-08-20 18:12:22.000000000 -0700
++++ config/config.mk 2011-08-20 18:56:24.000000000 -0700
+@@ -601,6 +601,12 @@ ifeq (2,$(MOZ_OPTIMIZE))
+ PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)"
+ endif # MOZ_OPTIMIZE=2
+ endif # MOZ_OPTIMIZE
+# Tell the Darwin linker how to find shared libraries that are not yet installed.
+ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))
+EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSPR_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
Deleted: trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch 2011-08-21 04:20:04 UTC (rev 82862)
+++ trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch 2011-08-21 04:50:59 UTC (rev 82863)
@@ -1,196 +0,0 @@
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.cpp mozilla-central/dom/plugins/PluginInstanceChild.cpp
---- dom/plugins/PluginInstanceChild.cpp 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginInstanceChild.cpp 2010-12-21 14:04:20.000000000 -0800
-@@ -126,7 +126,7 @@ PluginInstanceChild::PluginInstanceChild
- , mWinlessHiddenMsgHWND(0)
- #endif // OS_WIN
- , mAsyncCallMutex("PluginInstanceChild::mAsyncCallMutex")
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- #if defined(__i386__)
- , mEventModel(NPEventModelCarbon)
- #endif
-@@ -180,7 +180,7 @@ PluginInstanceChild::~PluginInstanceChil
- #if defined(OS_WIN)
- NS_ASSERTION(!mPluginWindowHWND, "Destroying PluginInstanceChild without NPP_Destroy?");
- #endif
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- if (mShColorSpace) {
- ::CGColorSpaceRelease(mShColorSpace);
- }
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.h mozilla-central/dom/plugins/PluginInstanceChild.h
---- dom/plugins/PluginInstanceChild.h 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginInstanceChild.h 2010-12-21 14:04:20.000000000 -0800
-@@ -44,7 +44,7 @@
- #include "mozilla/plugins/StreamNotifyChild.h"
- #if defined(OS_WIN)
- #include "mozilla/gfx/SharedDIBWin.h"
--#elif defined(OS_MACOSX)
-+#elif defined(MOZ_WIDGET_COCOA)
- #include "nsCoreAnimationSupport.h"
- #include "base/timer.h"
- #endif
-@@ -370,7 +370,7 @@ private:
- HBITMAP bmp;
- } mAlphaExtract;
- #endif // defined(OS_WIN)
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- private:
- #if defined(__i386__)
- NPEventModel mEventModel;
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceParent.cpp mozilla-central/dom/plugins/PluginInstanceParent.cpp
---- dom/plugins/PluginInstanceParent.cpp 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginInstanceParent.cpp 2010-12-21 14:04:20.000000000 -0800
-@@ -108,7 +108,7 @@ PluginInstanceParent::PluginInstancePare
- void
- PluginInstanceParent::InitQuirksModes(const nsCString& aMimeType)
- {
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- NS_NAMED_LITERAL_CSTRING(flash, "application/x-shockwave-flash");
- // Flash sends us Invalidate events so we will use those
- // instead of the refresh timer.
-@@ -127,7 +127,7 @@ PluginInstanceParent::~PluginInstancePar
- NS_ASSERTION(!(mPluginHWND || mPluginWndProc),
- "Subclass was not reset correctly before the dtor was reached!");
- #endif
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- if (mShWidth != 0 && mShHeight != 0) {
- DeallocShmem(mShSurface);
- }
-@@ -1427,7 +1427,7 @@ PluginInstanceParent::AnswerPluginFocusC
- #endif
- }
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- void
- PluginInstanceParent::Invalidate()
- {
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceParent.h mozilla-central/dom/plugins/PluginInstanceParent.h
---- dom/plugins/PluginInstanceParent.h 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginInstanceParent.h 2010-12-21 14:04:20.000000000 -0800
-@@ -43,7 +43,7 @@
- #include "mozilla/plugins/PluginScriptableObjectParent.h"
- #if defined(OS_WIN)
- #include "mozilla/gfx/SharedDIBWin.h"
--#elif defined(OS_MACOSX)
-+#elif defined(MOZ_WIDGET_COCOA)
- #include "nsCoreAnimationSupport.h"
- #endif
-
-@@ -256,9 +256,9 @@ public:
- virtual bool
- AnswerPluginFocusChange(const bool& gotFocus);
-
--#if defined(OS_MACOSX)
-+#ifdef MOZ_WIDGET_COCOA
- void Invalidate();
--#endif // definied(OS_MACOSX)
-+#endif // definied(MOZ_WIDGET_COCOA)
-
- nsresult AsyncSetWindow(NPWindow* window);
- nsresult GetSurface(gfxASurface** aSurface);
-@@ -308,7 +308,7 @@ private:
- WNDPROC mPluginWndProc;
- bool mNestedEventState;
- #endif // defined(XP_WIN)
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- private:
- Shmem mShSurface;
- size_t mShWidth;
-@@ -316,7 +316,7 @@ private:
- CGColorSpaceRef mShColorSpace;
- int16_t mDrawingModel;
- nsIOSurface *mIOSurface;
--#endif // definied(OS_MACOSX)
-+#endif // definied(MOZ_WIDGET_COCOA)
-
- // ObjectFrame layer wrapper
- nsRefPtr<gfxASurface> mFrontSurface;
-diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleChild.cpp mozilla-central/dom/plugins/PluginModuleChild.cpp
---- dom/plugins/PluginModuleChild.cpp 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginModuleChild.cpp 2010-12-21 14:04:20.000000000 -0800
-@@ -73,7 +73,7 @@
- #include "nsWindowsDllInterceptor.h"
- #endif
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- #include "PluginInterposeOSX.h"
- #include "PluginUtilsOSX.h"
- #endif
-@@ -1556,7 +1556,7 @@ _popupcontextmenu(NPP instance, NPMenu*
- PLUGIN_LOG_DEBUG_FUNCTION;
- AssertPluginThread();
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- double pluginX, pluginY;
- double screenX, screenY;
-
-@@ -2191,7 +2191,7 @@ PluginModuleChild::ResetEventHooks()
- }
- #endif
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- void
- PluginModuleChild::ProcessNativeEvents() {
- CallProcessSomeEvents();
-diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleChild.h mozilla-central/dom/plugins/PluginModuleChild.h
---- dom/plugins/PluginModuleChild.h 2010-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginModuleChild.h 2010-12-21 14:04:20.000000000 -0800
-@@ -193,7 +193,7 @@ public:
- static NPUTF8* NP_CALLBACK NPN_UTF8FromIdentifier(NPIdentifier aIdentifier);
- static int32_t NP_CALLBACK NPN_IntFromIdentifier(NPIdentifier aIdentifier);
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- void ProcessNativeEvents();
-
- void PluginShowWindow(uint32_t window_id, bool modal, CGRect r) {
-diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleParent.cpp mozilla-central/dom/plugins/PluginModuleParent.cpp
---- dom/plugins/PluginModuleParent.cpp 2010-12-14 17:02:44.000000000 -0800
-+++ dom/plugins/PluginModuleParent.cpp 2010-12-21 14:04:20.000000000 -0800
-@@ -915,9 +915,11 @@ CAUpdate(nsITimer *aTimer, void *aClosur
- nsTObserverArray<PluginInstanceParent*> *ips =
- static_cast<nsTObserverArray<PluginInstanceParent*> *>(aClosure);
- nsTObserverArray<PluginInstanceParent*>::ForwardIterator iter(*ips);
-+#ifdef MOZ_WIDGET_COCOA
- while (iter.HasMore()) {
- iter.GetNext()->Invalidate();
- }
-+#endif // MOZ_WIDGET_COCOA
- }
-
- void
-diff -Naurp mozilla-central.orig/modules/plugin/base/src/nsNPAPIPlugin.cpp mozilla-central/modules/plugin/base/src/nsNPAPIPlugin.cpp
---- modules/plugin/base/src/nsNPAPIPlugin.cpp 2010-12-14 17:03:31.000000000 -0800
-+++ modules/plugin/base/src/nsNPAPIPlugin.cpp 2010-12-21 14:04:20.000000000 -0800
-@@ -83,7 +83,7 @@
- #include "nsIObserverService.h"
- #include <prinrval.h>
-
--#ifdef XP_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- #include <Carbon/Carbon.h>
- #include <ApplicationServices/ApplicationServices.h>
- #include <OpenGL/OpenGL.h>
-diff -Naurp mozilla-central.orig/toolkit/library/Makefile.in mozilla-central/toolkit/library/Makefile.in
---- toolkit/library/Makefile.in 2010-12-14 17:03:37.000000000 -0800
-+++ toolkit/library/Makefile.in 2010-12-21 14:04:20.000000000 -0800
-@@ -194,6 +194,9 @@ EXTRA_DSO_LDOPTS += \
- -framework CoreAudio \
- -framework AudioToolbox \
- -framework AudioUnit \
-+ -framework IOKit \
-+ -framework Foundation \
-+ -framework AppKit \
- $(NULL)
- endif
- endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110820/7e59ddce/attachment-0001.html>
More information about the macports-changes
mailing list