[73876] trunk/dports/www/firefox-x11-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Nov 27 12:54:54 PST 2010
Revision: 73876
http://trac.macports.org/changeset/73876
Author: jeremyhu at macports.org
Date: 2010-11-27 12:54:50 -0800 (Sat, 27 Nov 2010)
Log Message:
-----------
firefox-x11-devel: Bump to 4.0b7
Modified Paths:
--------------
trunk/dports/www/firefox-x11-devel/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch
Removed Paths:
-------------
trunk/dports/www/firefox-x11-devel/files/527612.patch
trunk/dports/www/firefox-x11-devel/files/549746.patch
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2010-11-27 20:54:06 UTC (rev 73875)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2010-11-27 20:54:50 UTC (rev 73876)
@@ -7,7 +7,7 @@
name firefox-x11-devel
set component firefox
categories www x11
-version 3.6.12
+version 4.0b7
platforms darwin
maintainers jeremyhu openmaintainer
description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -19,23 +19,18 @@
universal_variant no
homepage http://www.mozilla.com/${component}/
-master_sites http://mozilla.isc.org/pub/mozilla.org/${component}/releases/${version}/source/ \
- http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/ \
- http://mirror.internode.on.net/pub/mozilla/${component}/releases/${version}/source/ \
- http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/${component}/releases/${version}/source/ \
- http://mirror.yandex.ru/mozilla/${component}/releases/${version}/source/ \
- http://mozilla.c3sl.ufpr.br/releases/${component}/releases/${version}/source/ \
- http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
+
+master_sites http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
distname ${component}-${version}.source
+dist_subdir ${component}
use_bzip2 yes
-dist_subdir ${component}
-checksums md5 80f4d83f23a7c45fc3f1904964ea2a5a \
- sha1 1cc3885687dd5ad21167d9d45f76eb1458f46bdd \
- rmd160 196e32a4cd9c6725e115aabcf320d7d8df5bca6e
+checksums md5 d2ab9b7eefcbbaedf45189b8662b3e3c \
+ sha1 57d4a079e639289ffd09a5779a5514c09889a6b8 \
+ rmd160 dc74a11272e9bdb1b94e3f42cd2e50fdace141c1
-worksrcdir mozilla-1.9.2
+worksrcdir mozilla-central
depends_build \
port:findutils \
@@ -69,7 +64,7 @@
--with-system-nss \
--with-nss-prefix=${prefix} \
--with-system-libxul \
- --with-libxul-sdk=${prefix}/lib/xulrunner \
+ --with-libxul-sdk=${prefix}/lib/xulrunner-devel \
--with-system-bzip2=${prefix} \
--with-system-jpeg=${prefix} \
--with-system-zlib=${prefix} \
@@ -115,6 +110,7 @@
# Force 32-bit, inline-asm
supported_archs i386 ppc
+
# Yes, this is ugly... but the real fix is in the works
# https://bugzilla.mozilla.org/show_bug.cgi?id=529878
configure.cc ${configure.cc} -arch ${configure.build_arch}
@@ -163,7 +159,7 @@
--with-system-nss \
--with-nss-prefix=${prefix} \
--with-system-libxul \
- --with-libxul-sdk=${prefix}/lib/xulrunner
+ --with-libxul-sdk=${prefix}/lib/xulrunner-devel
configure.args-append \
--enable-libxul
@@ -192,7 +188,7 @@
lib/libXt.dylib
}
-patchfiles patch-dylib_file.diff 527612.patch 549746.patch
+patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -202,22 +198,21 @@
# find -xtype -> gfind -xtype
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
+ # Don't use the system X11
+ reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
# Set the right install_name on the libs
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/rules.mk
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/config.mk
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/rules.mk
- reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure.in
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/coreconf/Darwin.mk
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
# Fix the correct library filenames for loading at runtime
- reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp
+ reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsApplicationAccessibleWrap.cpp
reinplace "s:libgssapi_krb5.so.2:${prefix}/libexec/heimdal/lib/libgssapi.2.dylib:" ${worksrcpath}/extensions/auth/nsAuthGSSAPI.cpp
@@ -227,18 +222,24 @@
reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
- reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/gfx/src/psshared/nsCUPSShim.cpp
+ reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/widget/src/gtk2/nsCUPSShim.cpp
reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+ reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_linux.cpp
+ reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_linux.cpp
+
+ reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_gtk_common.cpp
+
reinplace "s:libgtk-x11-2.0.so.0:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsBidiKeyboard.cpp
reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsIdleServiceGTK.cpp
reinplace "s:libXinerama.so.1:${prefix}/lib/libXinerama.1.dylib:" ${worksrcpath}/widget/src/gtk2/nsScreenManagerGtk.cpp
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}/widget/src/gtk2/nsFilePicker.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
@@ -282,7 +283,7 @@
# Workaround to get root certs loaded, so https:// works
ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
- }
+ }
}
livecheck.type regex
Deleted: trunk/dports/www/firefox-x11-devel/files/527612.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/527612.patch 2010-11-27 20:54:06 UTC (rev 73875)
+++ trunk/dports/www/firefox-x11-devel/files/527612.patch 2010-11-27 20:54:50 UTC (rev 73876)
@@ -1,11 +0,0 @@
---- browser/installer/Makefile.in.orig 2009-11-10 12:53:40.000000000 -0800
-+++ browser/installer/Makefile.in 2009-11-10 13:01:38.000000000 -0800
-@@ -116,7 +116,7 @@ endif
-
- include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
-
--ifeq (Darwin, $(OS_ARCH))
-+ifeq (bundle, $(MOZ_FS_LAYOUT))
- DEFINES += \
- -DBINPATH=$(_BINPATH) \
- -DAPPNAME=$(_APPNAME) \
Deleted: trunk/dports/www/firefox-x11-devel/files/549746.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/549746.patch 2010-11-27 20:54:06 UTC (rev 73875)
+++ trunk/dports/www/firefox-x11-devel/files/549746.patch 2010-11-27 20:54:50 UTC (rev 73876)
@@ -1,20 +0,0 @@
---- browser/installer/package-manifest.in.orig 2010-03-02 15:22:26.000000000 -0800
-+++ browser/installer/package-manifest.in 2010-03-02 15:21:55.000000000 -0800
-@@ -86,7 +86,7 @@
- @BINPATH@/plugins/MRJPlugin.plugin/
- #endif
- #elifdef XP_UNIX
-- at BINPATH@/plugins/libnullplugin.so
-+ at BINPATH@/plugins/libnullplugin at DLL_SUFFIX@
- #elifdef XP_WIN32
- #ifndef WINCE
- @BINPATH@/plugins/npnul32.dll
-@@ -195,7 +195,7 @@
- @BINPATH@/components/layout_xul.xpt
- #ifdef XP_UNIX
- #ifndef XP_MACOSX
-- at BINPATH@/components/libimgicon.so
-+ at BINPATH@/components/libimgicon at DLL_SUFFIX@
- #endif
- #endif
- @BINPATH@/components/locale.xpt
Added: trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch 2010-11-27 20:54:50 UTC (rev 73876)
@@ -0,0 +1,195 @@
+diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.cpp mozilla-central/dom/plugins/PluginInstanceChild.cpp
+--- dom/plugins/PluginInstanceChild.cpp 2010-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginInstanceChild.cpp 2010-11-27 11:39:06.000000000 -0500
+@@ -123,7 +123,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
+@@ -179,7 +179,7 @@ PluginInstanceChild::~PluginInstanceChil
+ #if defined(OS_WIN)
+ DestroyPluginWindow();
+ #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-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginInstanceChild.h 2010-11-27 11:39:06.000000000 -0500
+@@ -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
+@@ -388,7 +388,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-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginInstanceParent.cpp 2010-11-27 11:40:26.000000000 -0500
+@@ -106,7 +106,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.
+@@ -125,7 +125,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);
+ }
+@@ -1437,7 +1437,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-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginInstanceParent.h 2010-11-27 11:41:54.000000000 -0500
+@@ -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 NotifyPainted(void);
+@@ -310,7 +310,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;
+@@ -318,7 +318,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-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginModuleChild.cpp 2010-11-27 11:39:06.000000000 -0500
+@@ -69,7 +69,7 @@
+ #include "COMMessageFilter.h"
+ #endif
+
+-#ifdef OS_MACOSX
++#ifdef MOZ_WIDGET_COCOA
+ #include "PluginInterposeOSX.h"
+ #include "PluginUtilsOSX.h"
+ #endif
+@@ -1541,7 +1541,7 @@ _popupcontextmenu(NPP instance, NPMenu*
+ PLUGIN_LOG_DEBUG_FUNCTION;
+ AssertPluginThread();
+
+-#ifdef OS_MACOSX
++#ifdef MOZ_WIDGET_COCOA
+ double pluginX, pluginY;
+ double screenX, screenY;
+
+@@ -2101,7 +2101,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-11-04 16:05:43.000000000 -0400
++++ dom/plugins/PluginModuleChild.h 2010-11-27 11:39:06.000000000 -0500
+@@ -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/modules/plugin/base/src/nsNPAPIPlugin.cpp mozilla-central/modules/plugin/base/src/nsNPAPIPlugin.cpp
+--- modules/plugin/base/src/nsNPAPIPlugin.cpp 2010-11-04 16:06:43.000000000 -0400
++++ modules/plugin/base/src/nsNPAPIPlugin.cpp 2010-11-27 11:39:06.000000000 -0500
+@@ -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-11-04 16:06:54.000000000 -0400
++++ toolkit/library/Makefile.in 2010-11-27 11:39:06.000000000 -0500
+@@ -194,6 +194,9 @@ EXTRA_DSO_LDOPTS += \
+ -framework CoreAudio \
+ -framework AudioToolbox \
+ -framework AudioUnit \
++ -framework IOKit \
++ -framework Foundation \
++ -framework AppKit \
+ $(NULL)
+ endif
+ endif
+--- dom/plugins/PluginModuleParent.cpp.orig 2010-11-27 13:28:49.000000000 -0500
++++ dom/plugins/PluginModuleParent.cpp 2010-11-27 13:29:21.000000000 -0500
+@@ -923,9 +923,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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101127/3518dc2c/attachment.html>
More information about the macports-changes
mailing list