[73875] trunk/dports/devel/xulrunner-devel

jeremyhu at macports.org jeremyhu at macports.org
Sat Nov 27 12:54:11 PST 2010


Revision: 73875
          http://trac.macports.org/changeset/73875
Author:   jeremyhu at macports.org
Date:     2010-11-27 12:54:06 -0800 (Sat, 27 Nov 2010)
Log Message:
-----------
xulrunner-devel: Bump to 2.0b7

Modified Paths:
--------------
    trunk/dports/devel/xulrunner-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/xulrunner-devel/files/plugin-instance-nococoa.patch

Modified: trunk/dports/devel/xulrunner-devel/Portfile
===================================================================
--- trunk/dports/devel/xulrunner-devel/Portfile	2010-11-27 20:25:50 UTC (rev 73874)
+++ trunk/dports/devel/xulrunner-devel/Portfile	2010-11-27 20:54:06 UTC (rev 73875)
@@ -7,11 +7,11 @@
 name            xulrunner-devel
 set component	xulrunner
 categories      devel
-version		1.9.2.12
-#set ff_version  3.6
+version		2.0b7
+set ff_version  4.0b7
 platforms       darwin
 maintainers     jeremyhu openmaintainer
-description	Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications
+description     Mozilla.org's runtime package that can be used to bootstrap XUL+XPCOM applications
 
 long_description ${description}
 
@@ -19,20 +19,21 @@
 
 homepage        http://developer.mozilla.org/en/docs/XULRunner
 
-master_sites    http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
-distname        ${component}-${version}.source
+#master_sites    http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
+#distname        ${component}-${version}.source
+#dist_subdir     ${component}
 
-#master_sites    http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${ff_version}/source
-#distname        firefox-${ff_version}.source
+master_sites    http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${ff_version}/source
+distname        firefox-${ff_version}.source
+dist_subdir     firefox
 
 use_bzip2       yes
-dist_subdir     ${component}
 
-checksums           md5     5ae8ad797214474140a67b79fb8ece77 \
-                    sha1    9a6dd5cb120879c9e0aafdc48591b1612883961b \
-                    rmd160  eeb534cfe18c3778967a9fd6a749760fc212ade1
+checksums           md5     d2ab9b7eefcbbaedf45189b8662b3e3c \
+                    sha1    57d4a079e639289ffd09a5779a5514c09889a6b8 \
+                    rmd160  dc74a11272e9bdb1b94e3f42cd2e50fdace141c1
 
-worksrcdir      mozilla-1.9.2
+worksrcdir      mozilla-central
 
 depends_build \
 	port:findutils \
@@ -66,6 +67,14 @@
 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 \
 	--disable-static \
@@ -84,7 +93,7 @@
 	--enable-system-lcms \
 	--enable-system-cairo \
 	--enable-system-sqlite \
-	--with-default-mozilla-five-home=${prefix}/lib/${component} \
+	--with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \
 	--enable-oji \
 	--enable-plugins \
 	--enable-mathml \
@@ -125,6 +134,11 @@
 # 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}
+configure.cxx ${configure.cxx} -arch ${configure.build_arch}
+
 variant debug description {build with debugging symbols} {
     configure.args-delete   --disable-debug \
                             --disable-mochitest \
@@ -169,7 +183,7 @@
         lib/nss/libnss3.dylib
 }
 
-patchfiles patch-dylib_file.diff
+patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -183,17 +197,17 @@
     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/${component}:g" ${worksrcpath}/config/config.mk
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/config/rules.mk
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/js/src/config/config.mk
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/js/src/config/rules.mk
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/nsprpub/configure.in
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/nsprpub/configure
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/security/coreconf/Darwin.mk
-    reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
+    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}/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
 
@@ -203,18 +217,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
 
@@ -229,21 +249,30 @@
 
 configure.env \
 	MOZCONFIG="${worksrcpath}/xulrunner/config/mozconfig" \
-	MOZILLA_FIVE_HOME="${prefix}/lib/${component}"
+	MOZILLA_FIVE_HOME="${prefix}/lib/${pkg_name}"
 
 build.args-append \
-	includedir="${prefix}/include/${component}" \
-	idldir="${prefix}/share/idl/${component}" \
-	installdir="${prefix}/lib/${component}" \
-	sdkdir="${prefix}/lib/${component}"
+	includedir="${prefix}/include/${pkg_name}" \
+	idldir="${prefix}/share/idl/${pkg_name}" \
+	installdir="${prefix}/lib/${pkg_name}" \
+	sdkdir="${prefix}/lib/${pkg_name}"
 
 destroot.args-append \
-	includedir="${prefix}/include/${component}" \
-	idldir="${prefix}/share/idl/${component}" \
-	installdir="${prefix}/lib/${component}" \
-	sdkdir="${prefix}/lib/${component}"
+	includedir="${prefix}/include/${pkg_name}" \
+	idldir="${prefix}/share/idl/${pkg_name}" \
+	installdir="${prefix}/lib/${pkg_name}" \
+	sdkdir="${prefix}/lib/${pkg_name}"
 
 post-destroot   {
-    ## Workaround to get root certs loaded, so https:// works
-    #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${component}/libnssckbi.dylib
+    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
+livecheck.url   http://releases.mozilla.org/pub/mozilla.org/${component}/releases
+livecheck.regex ">(\\d+(?:\\.\\d+)*).<"

Added: trunk/dports/devel/xulrunner-devel/files/plugin-instance-nococoa.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/plugin-instance-nococoa.patch	                        (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/plugin-instance-nococoa.patch	2010-11-27 20:54:06 UTC (rev 73875)
@@ -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/b7e30e3b/attachment-0001.html>


More information about the macports-changes mailing list