openjdk team mailing list archive

[TJ <ubuntu@xxxxxxxxxxx>]

I attached an incorrect set of patches to my earlier email. This is the
correct set for:

debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff
debian/rules

Apply from the source package's base directory.

As before, the changelog entry is:

openjdk-6 (6b14-1.4.1-0ubuntu12~tj~ppa1j) jaunty; urgency=low

  * Fix IcedTeaPlugin failure to start with xulrunner 1.9.1 (LP: #359407).
     debian/rules: add patch icedtea-plugin-use-runtime-nsIProcess-IID.diff

 -- TJ <ubuntu@xxxxxxxxxxx>  Thu, 17 Sep 2009 18:00:00 +0100


--- openjdk-6-6b14-1.4.1/debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff	1970-01-01 01:00:00.000000000 +0100
+++ openjdk-6-6b14-1.4.1-0ubuntu12~tj~ppa1j/debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff	2009-09-17 19:05:59.981677497 +0100
@@ -0,0 +1,29 @@
+diff -uN a/IcedTeaPlugin.cc b/IcedTeaPlugin.cc
+--- a/IcedTeaPlugin.cc
++++ b/IcedTeaPlugin.cc
+@@ -3824,6 +3824,8 @@ void IcedTeaPluginFactory::IcedTeaPluginFactory::WriteToJVM(nsCString& message)
+ 
+ */
+ 
++#include <nsIInterfaceInfoManager.h>
++
+ nsresult
+ IcedTeaPluginFactory::StartAppletviewer ()
+ {
+@@ -3845,9 +3847,15 @@ IcedTeaPluginFactory::StartAppletviewer ()
+   result = file->InitWithNativePath (nsCString (appletviewer_executable));
+   PLUGIN_CHECK_RETURN ("init with path", result);
+ 
++  // run-time query provided through nsIInterfaceInfoManager
++  nsCOMPtr<nsIInterfaceInfoManager> iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
++  // get the run-time IID of nsIProcess (don't rely on a the build-time IID)
++  nsIID *nsIProcessIID;
++  iim->GetIIDForName("nsIProcess", &nsIProcessIID);
++
+   result = manager->CreateInstanceByContractID (NS_PROCESS_CONTRACTID,
+                                                 nsnull,
+-                                                NS_GET_IID (nsIProcess),
++                                                *nsIProcessIID,
+                                                 getter_AddRefs (applet_viewer_process));
+   PLUGIN_CHECK_RETURN ("create process", result);
+ 

--- openjdk-6-6b14-1.4.1/debian/rules	2009-09-17 21:18:24.000000000 +0100
+++ openjdk-6-6b14-1.4.1-0ubuntu12~tj~ppa1j/debian/rules	2009-09-17 19:15:24.273667874 +0100
@@ -663,6 +663,9 @@
 	test -x /usr/bin/linux32 &&linux32 /bin/uname -a || true
 
 	patch --verbose -p0 < debian/patches/zero-port-opt.diff
+	patch --verbose -p1 < debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff
+	# keep a marker to indicate patch is applied
+	touch debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff.stamp
 
 	mkdir -p stamps
 	mkdir -p build
@@ -1027,6 +1030,10 @@
 	  patch --verbose -p0 -R < debian/patches/zero-port-opt.diff; \
 	  rm -f ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_arm.S; \
 	fi
+	if [ -f debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff.stamp ]; then \
+	  patch --verbose -p1 -R < debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff; \
+	  rm -f debian/patches/icedtea-plugin-use-runtime-nsIProcess-IID.diff.stamp; \
+	fi
 
 ifeq (0,1)
 	for i in $$(find test/jtreg -name '*.gif') overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/expresso.mid overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/ding.sf2; do \