[79528] trunk/dports/www/firefox-x11
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jun 16 09:57:46 PDT 2011
Revision: 79528
http://trac.macports.org/changeset/79528
Author: jeremyhu at macports.org
Date: 2011-06-16 09:57:46 -0700 (Thu, 16 Jun 2011)
Log Message:
-----------
firefox-x11: Bump to 4.0.1, remove +internal_dependencies variant (now forced on)
Modified Paths:
--------------
trunk/dports/www/firefox-x11/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11/files/PR-623797.patch
trunk/dports/www/firefox-x11/files/plugin-instance-nococoa.patch
Removed Paths:
-------------
trunk/dports/www/firefox-x11/files/527612.patch
trunk/dports/www/firefox-x11/files/549746.patch
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2011-06-16 16:56:27 UTC (rev 79527)
+++ trunk/dports/www/firefox-x11/Portfile 2011-06-16 16:57:46 UTC (rev 79528)
@@ -7,10 +7,10 @@
name firefox-x11
set component firefox
categories www x11
-version 3.6.16
+version 4.0.1
platforms darwin
maintainers jeremyhu openmaintainer
-description Mozilla.org's popular stand-alone web browser
+description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
long_description \
Firefox empowers you to browse faster, more safely and more \
@@ -19,40 +19,48 @@
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 232a3c0160cd1cbe3dcaaaf7e4ae51c2 \
- sha1 38124597440b7d60aa568adeef23659575841e92 \
- rmd160 fdb7b41f25a5b8ba6eb1c5672ecc668c962b0af8
+checksums md5 9abda7d23151e97913c8555a64c13f34 \
+ sha1 c89bc5106266aa0097a7be15be84555bd2649f03 \
+ rmd160 63faaae78b56db407a34454986361212382c838e
-worksrcdir mozilla-1.9.2
+worksrcdir mozilla-2.0
depends_build \
port:findutils \
port:pkgconfig \
- port:autoconf213
+ port:autoconf213 \
+ port:yasm
depends_lib \
- port:xulrunner
+ port:heimdal \
+ port:gconf \
+ port:esound \
+ port:libcanberra \
+ port:findutils \
+ port:gtk2 \
+ port:mesa \
+ port:xorg-libXt \
+ port:libnotify
+archcheck.files \
+ libexec/heimdal/lib/libkrb5.dylib \
+ lib/libcanberra.dylib \
+ lib/libgconf-2.dylib \
+ lib/libgtk-x11-2.0.dylib \
+ lib/libnotify.dylib \
+ lib/libXt.dylib
+
use_autoconf yes
autoconf.cmd autoconf213
-if {[variant_isset internal_dependencies]} {
- set pkg_name ${name}-standalone
-} else {
- set pkg_name ${component}-x11
-}
+set pkg_name ${name}
configure.args \
--with-xulrunner-stub-name=xulrunner-stub \
@@ -64,18 +72,10 @@
--enable-default-toolkit=cairo-gtk2 \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
- --with-system-nspr \
- --with-nspr-prefix=${prefix} \
- --with-system-nss \
- --with-nss-prefix=${prefix} \
- --with-system-libxul \
- --with-libxul-sdk=${prefix}/lib/xulrunner \
- --with-system-bzip2=${prefix} \
- --with-system-jpeg=${prefix} \
- --with-system-zlib=${prefix} \
- --enable-system-lcms \
- --enable-system-cairo \
- --enable-system-sqlite \
+ --enable-libxul \
+ --disable-system-lcms \
+ --disable-system-cairo \
+ --disable-system-sqlite \
--with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \
--enable-oji \
--enable-plugins \
@@ -113,8 +113,11 @@
# xpctools and necko-wifi broke in 3.6b1
-# Force 32-bit, inline-asm
-supported_archs i386 ppc
+# gcc-4.0 has issues, so force gcc-4.2 on Leopard
+if {${configure.compiler} == "gcc-4.0"} {
+ configure.compiler gcc-4.2
+}
+
# 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}
@@ -156,68 +159,36 @@
--enable-official-branding
}
-variant internal_dependencies description {Use internal versions of nspr, nss, and xulrunner} {
- configure.args-delete \
- --with-system-nspr \
- --with-nspr-prefix=${prefix} \
- --with-system-nss \
- --with-nss-prefix=${prefix} \
- --with-system-libxul \
- --with-libxul-sdk=${prefix}/lib/xulrunner
+# plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370
+patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
- configure.args-append \
- --enable-libxul
-
- depends_lib-delete \
- port:xulrunner
-
- depends_lib-append \
- port:heimdal \
- port:lcms \
- port:gconf \
- port:esound \
- port:libcanberra \
- port:findutils \
- port:gtk2 \
- port:xorg-libXt \
- port:libnotify
-
- archcheck.files-append \
- libexec/heimdal/lib/libkrb5.dylib \
- lib/libcanberra.dylib \
- lib/libgconf-2.dylib \
- lib/libgtk-x11-2.0.dylib \
- lib/liblcms.dylib \
- lib/libnotify.dylib \
- lib/libXt.dylib
-}
-
-patchfiles patch-dylib_file.diff 527612.patch 549746.patch
-
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/xpcom/base/nsStackWalk.cpp
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=641755
+ reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/gfx/ycbcr/update.sh
+ reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/gfx/ycbcr/yuv_row_posix.cpp
+
# https://bugzilla.mozilla.org/show_bug.cgi?id=486034
# 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 +198,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
@@ -277,12 +254,6 @@
${destroot}${prefix}/share/applications/${name}.desktop
move ${destroot}${prefix}/bin/${component} ${destroot}${prefix}/bin/${pkg_name}
- if {![variant_isset internal_dependencies]} {
- ln -s ${pkg_name} ${destroot}${prefix}/bin/${component}
-
- # 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/files/527612.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/527612.patch 2011-06-16 16:56:27 UTC (rev 79527)
+++ trunk/dports/www/firefox-x11/files/527612.patch 2011-06-16 16:57:46 UTC (rev 79528)
@@ -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/files/549746.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/549746.patch 2011-06-16 16:56:27 UTC (rev 79527)
+++ trunk/dports/www/firefox-x11/files/549746.patch 2011-06-16 16:57:46 UTC (rev 79528)
@@ -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/files/PR-623797.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/PR-623797.patch (rev 0)
+++ trunk/dports/www/firefox-x11/files/PR-623797.patch 2011-06-16 16:57:46 UTC (rev 79528)
@@ -0,0 +1,128 @@
+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/files/plugin-instance-nococoa.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/plugin-instance-nococoa.patch (rev 0)
+++ trunk/dports/www/firefox-x11/files/plugin-instance-nococoa.patch 2011-06-16 16:57:46 UTC (rev 79528)
@@ -0,0 +1,196 @@
+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/20110616/5827c456/attachment-0001.html>
More information about the macports-changes
mailing list