changeset in /hg/icedtea: Merge IcedTea6 1.3.1.

Andrew John Hughes gnu_andrew at member.fsf.org
Wed Oct 29 11:29:44 PDT 2008


changeset c3e121763e20 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3e121763e20
description:
	Merge IcedTea6 1.3.1.

	2008-10-29  Andrew John Hughes  <ahughes at redhat.com>

		Merge from IcedTea6 1.3.1.
		* ChangeLog,
		* HACKING,
		* IcedTeaPlugin.cc,
		* Makefile.am,
		* NEWS,
		* gcjwebplugin.cc,
		* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
		* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
		* patches/icedtea-fonts.patch,
		* patches/icedtea-renderer-crossing.patch,
		* patches/icedtea-uname.patch,
		* plugin/icedtea/netscape/javascript/JSObject.java,
		* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
		* plugin/icedtea/sun/applet/PluginAppletViewer.java,
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
		* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
		* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java:
		Merged.

diffstat:

17 files changed, 280 insertions(+), 67 deletions(-)
ChangeLog                                                                          |  105 +++++++++-
HACKING                                                                            |    2 
IcedTeaPlugin.cc                                                                   |  103 ++++++---
Makefile.am                                                                        |   20 +
NEWS                                                                               |    8 
gcjwebplugin.cc                                                                    |    2 
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java          |   20 +
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java         |   13 +
patches/icedtea-fonts.patch                                                        |    4 
patches/icedtea-renderer-crossing.patch                                            |   15 +
patches/icedtea-uname.patch                                                        |   12 -
plugin/icedtea/netscape/javascript/JSObject.java                                   |    2 
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java                         |   12 -
plugin/icedtea/sun/applet/PluginAppletViewer.java                                  |    6 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp                                    |    6 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |    6 
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java      |   11 -

diffs (truncated from 798 to 500 lines):

diff -r ec3687cb7d51 -r c3e121763e20 ChangeLog
--- a/ChangeLog	Mon Oct 27 23:39:36 2008 +0000
+++ b/ChangeLog	Wed Oct 29 18:29:19 2008 +0000
@@ -1,3 +1,25 @@ 2008-10-27  Andrew John Hughes  <ahughes
+2008-10-29  Andrew John Hughes  <ahughes at redhat.com>
+
+	Merge from IcedTea6 1.3.1.
+	* ChangeLog,
+	* HACKING,
+	* IcedTeaPlugin.cc,
+	* Makefile.am,
+	* NEWS,
+	* gcjwebplugin.cc,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
+	* patches/icedtea-fonts.patch,
+	* patches/icedtea-renderer-crossing.patch,
+	* patches/icedtea-uname.patch,
+	* plugin/icedtea/netscape/javascript/JSObject.java,
+	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java,
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
+	* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java:
+	Merged.
+
 2008-10-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
@@ -7,6 +29,10 @@ 2008-10-27  Andrew John Hughes  <ahughes
 	* patches/icedtea-rhino.patch:
 	Regenerated.
 
+2008-10-27  Lillian Angel  <langel at redhat.com>
+
+	* NEWS: Updated for 1.3.1 release.
+
 2008-10-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/234:
@@ -15,6 +41,21 @@ 2008-10-27  Andrew John Hughes  <ahughes
 	to be the JDK release version so the HotSpot
 	versioning is revealed.
 
+2008-10-27  Deepak Bhole  <dbhole at redhat.com>
+
+	* IcedTeaPlugin.cc: Fix address pointer integer overflow on 64-bit
+	systems.
+	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Set cache
+	dir to be local to each user (~/.icedteaplugin/cache).
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Apply patch from Tom
+	Fitzsimmons for Bug# 230.
+
+2008-10-27  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-renderer-crossing.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-10-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-license-headers.patch,
@@ -27,6 +68,11 @@ 2008-10-27  Andrew John Hughes  <ahughes
 
 	* configure.ac:
 	Quote checking output.
+
+2008-10-27  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-uname.dpatch: Only call dpkg-architecture if it is
+	available.
 	
 2008-10-24  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -72,6 +118,10 @@ 2008-10-24  Andrew John Hughes  <ahughes
 	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
 	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Merged.
 
+2008-10-25  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (clean-pulse-java): Remove object files.
+
 2008-10-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-constructor-properties.patch:
@@ -83,6 +133,55 @@ 2008-10-22  Andrew John Hughes  <ahughes
 	* patches/icedtea-ecj-jopt.patch: Only add -J options
 	to jar in JDK and CORBA when supported.
 
+2008-10-25  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (gcjwebplugin.so, IcedTeaPlugin.o): Pass PLUGIN_VERSION.
+	* gcjwebplugin.cc, IcedTeaPlugin.cc: Encode PLUGIN_VERSION in
+	PLUGIN_DESCRIPTION.
+
+2008-10-24  Omair Majid <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(write): Check for offset being negative.
+	* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
+	(testMixerKnowsAboutOpenClips): Removed the assumption that mixer had no
+	other lines open.
+
+2008-10-24  Deepak Bhole  <dbhole at redhat.com>
+
+	* plugin/icedtea/netscape/javascript/JSObject.java: Make long constructor
+	public.
+
+2008-10-24  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (clean-pulseaudio): Don't remove source files. Might
+	not be correct, but doesn't do harm in any build environment.
+
+2008-10-23  Deepak Bhole  <dbhole at redhat.com>
+
+	* IcedTeaPlugin.cc: Implement proper timeout action.
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Supply new
+	exitOnFailure argument to Netx.
+	* rt/net/sourceforge/jnlp/Launcher.java: Implement an option for not
+	exiting VM on error.
+	* rt/net/sourceforge/jnlp/NetxPanel.java: Same.
+
+2008-10-23  Lillian Angel  <langel at redhat.com>
+
+	PR redhat/468193:
+	* patches/icedtea-fonts.patch: Updated for filename change.
+
+2008-10-23  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/229:
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Parse goto_w correctly.
+
+2008-10-23  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (stamps/patch.stamp): Make sure rt dir exists when
+	ENABLE_PLUGIN is true.
+
 2008-10-23  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/204:
@@ -95,9 +194,9 @@ 2008-10-23  Gary Benson  <gbenson at redhat
 
 2008-10-22  Matthias Klose  <doko at ubuntu.com>
 
-        * Makefile.am: Revert the previous change. Always pass DISTRIBUTION_ID
-        instead.
-        * configure.ac: Make DIST_ID more precise. Some implementations of the
+	* Makefile.am: Revert the previous change. Always pass DISTRIBUTION_ID
+	instead.
+	* configure.ac: Make DIST_ID more precise. Some implementations of the
 	lsb_release command quote the output; ignore it.
 
 2008-10-22  Omair Majid  <omajid at redhat.com>
diff -r ec3687cb7d51 -r c3e121763e20 HACKING
--- a/HACKING	Mon Oct 27 23:39:36 2008 +0000
+++ b/HACKING	Wed Oct 29 18:29:19 2008 +0000
@@ -63,6 +63,8 @@ The following patches are currently appl
 * icedtea-arch.patch: Add support for additional architectures.
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
+* patches/icedtea-renderer-crossing.patch: Check whether crossing is
+  initialized in Pisces Renderer.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r ec3687cb7d51 -r c3e121763e20 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Mon Oct 27 23:39:36 2008 +0000
+++ b/IcedTeaPlugin.cc	Wed Oct 29 18:29:19 2008 +0000
@@ -84,6 +84,9 @@ PRThread* current_thread ();
 // #13 0x0153f91c in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0xbff3065c "\235\225$") at ProxyJNI.cpp:580
 // #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641
 
+// timeout (in seconds) for various calls to java side
+#define TIMEOUT 20
+
 #define NOT_IMPLEMENTED() \
   printf ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__)
 
@@ -189,6 +192,12 @@ inline suseconds_t get_time_in_ms()
 	gettimeofday(&tv, &tz);
 
 	return tv.tv_usec;
+}
+
+inline long get_time_in_s()
+{
+	time_t t;
+	return time(&t);
 }
 
 // __func__ is a variable, not a string literal, so it cannot be
@@ -266,7 +275,7 @@ inline suseconds_t get_time_in_ms()
 #endif
 
 #define PLUGIN_NAME "IcedTea Web Browser Plugin"
-#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME " executes Java applets."
+#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
 #define PLUGIN_MIME_DESC                                               \
   "application/x-java-vm:class,jar:IcedTea;"                           \
   "application/x-java-applet:class,jar:IcedTea;"                       \
@@ -439,7 +448,7 @@ char const* TYPES[10] = { "Object",
 
 #define MESSAGE_ADD_SIZE(size)                  \
   message += " ";                               \
-  message.AppendInt (size);
+  message.AppendInt ((PRUintn) size);
 
 // Pass character value through socket as an integer.
 #define MESSAGE_ADD_TYPE(type)                  \
@@ -2383,13 +2392,31 @@ IcedTeaPluginInstance::SetWindow (nsPlug
     {
 
        if (initialized == PR_FALSE) 
-	     {
-
-            PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::SetWindow: Instance %p waiting for initialization...\n", this);
-
-           while (initialized == PR_FALSE && this->fatalErrorOccurred == PR_FALSE) {
-              PROCESS_PENDING_EVENTS;
+       {
+
+           PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::SetWindow: Instance %p waiting for initialization...\n", this);
+
+           long startTime = get_time_in_s();
+           PRBool timedOut = PR_FALSE;
+
+           while (initialized == PR_FALSE && this->fatalErrorOccurred == PR_FALSE) 
+           {
+               PROCESS_PENDING_EVENTS;
+
+               if ((get_time_in_s() - startTime) > TIMEOUT)
+               {
+                   timedOut = PR_TRUE;
+                   break;
+                }
             }
+
+            // we timed out
+            if (timedOut == PR_TRUE)
+			{
+                PLUGIN_DEBUG_1ARG ("Initialization for instance %d has timed out. Marking it void\n", instance_identifier);
+				this->fatalErrorOccurred = PR_TRUE;
+                return NS_ERROR_FAILURE;
+			}
 
             // did we bail because there is no jvm?
             if (this->fatalErrorOccurred == PR_TRUE)
@@ -2531,12 +2558,28 @@ IcedTeaPluginInstance::GetJavaObject (jo
   if (initialized == PR_FALSE) 
     {
 
-      PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::SetWindow: Instance %p waiting for initialization...\n", this);
-
-      while (initialized == PR_FALSE) {
-        PROCESS_PENDING_EVENTS;
-//      printf("waiting for java object\n");
+      PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::GetJavaObject: Instance %p waiting for initialization...\n", this);
+
+      long startTime = get_time_in_s();
+      PRBool timedOut = PR_FALSE;
+      while (initialized == PR_FALSE && this->fatalErrorOccurred == PR_FALSE) 
+      {
+          PROCESS_PENDING_EVENTS;
+
+          if ((get_time_in_s() - startTime) > TIMEOUT)
+          {
+              timedOut = PR_TRUE;
+              break;
+           }
       }
+
+      // we timed out
+      if (timedOut == PR_TRUE)
+	  {
+          PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::GetJavaObject: Initialization for instance %d has timed out. Marking it void\n", instance_identifier);
+          this->fatalErrorOccurred = PR_TRUE;
+          return NS_ERROR_FAILURE;
+	  }
 
       PLUGIN_DEBUG_1ARG ("Instance %p initialization complete...\n", this);
     }
@@ -2572,8 +2615,13 @@ IcedTeaPluginFactory::GetJavaObject (PRU
   nsresult result = NS_OK;
 
   // wait for result
+  long startTime = get_time_in_s();
   while (object_identifier_return == 0) {
 	  current->ProcessNextEvent(PR_TRUE, &processed);
+
+	  // If we have been waiting for more than 20 seconds, something is wrong
+	  if ((get_time_in_ms() - startTime) > TIMEOUT)
+		  break;
   }
 
   PLUGIN_DEBUG_1ARG ("GOT JAVA OBJECT IDENTIFIER: %d\n", object_identifier_return);
@@ -3585,14 +3633,14 @@ IcedTeaPluginFactory::StartAppletviewer 
   PLUGIN_DEBUG_TWO ("clearing old input fifo (if any):", in_pipe_name);
   g_remove(in_pipe_name);
 
-  PLUGIN_DEBUG_TWO ("GCJ_New: creating input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("creating input fifo:", in_pipe_name);
   if (mkfifo (in_pipe_name, 0700) == -1 && errno != EEXIST)
     {
       PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
       result = NS_ERROR_OUT_OF_MEMORY;
       goto cleanup_in_pipe_name;
     }
-  PLUGIN_DEBUG_TWO ("GCJ_New: created input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("created input fifo:", in_pipe_name);
 
   // Create plugin-to-appletviewer pipe which we refer to as the
   // output pipe.
@@ -3614,14 +3662,14 @@ IcedTeaPluginFactory::StartAppletviewer 
   PLUGIN_DEBUG_TWO ("clearing old output fifo (if any):", out_pipe_name);
   
   g_remove(out_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: creating output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("creating output fifo:", out_pipe_name);
   if (mkfifo (out_pipe_name, 0700) == -1 && errno != EEXIST)
     {
       PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
       result = NS_ERROR_OUT_OF_MEMORY;
       goto cleanup_out_pipe_name;
     }
-  PLUGIN_DEBUG_TWO ("GCJ_New: created output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name);
 
   result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull);
   PLUGIN_CHECK_RETURN ("run process", result);
@@ -3696,9 +3744,9 @@ IcedTeaPluginFactory::StartAppletviewer 
 
   // cleanup_out_pipe:
   // Delete output pipe.
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleting input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleting input fifo:", in_pipe_name);
   unlink (out_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleted input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleted input fifo:", in_pipe_name);
 
  cleanup_out_pipe_name:
   g_free (out_pipe_name);
@@ -3706,9 +3754,9 @@ IcedTeaPluginFactory::StartAppletviewer 
 
   // cleanup_in_pipe:
   // Delete input pipe.
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleting output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleting output fifo:", out_pipe_name);
   unlink (in_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleted output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleted output fifo:", out_pipe_name);
 
  cleanup_in_pipe_name:
   g_free (in_pipe_name);
@@ -3840,7 +3888,7 @@ IcedTeaPluginInstance::GetWindow ()
   message += " ";
   message += "JavaScriptGetWindow";
   message += " ";
-  message.AppendInt (liveconnect_window);
+  message.AppendInt ((PRUintn) liveconnect_window);
   factory->SendMessageToAppletViewer (message);
 }
 
@@ -4558,7 +4606,7 @@ IcedTeaJNIEnv::ValueString (jni_type typ
       retstr.AppendInt (value.i);
       break;
     case jlong_type:
-      retstr.AppendInt (value.j);
+      retstr.AppendInt ((PRUintn) value.j);
       break;
     case jfloat_type:
       retstr += IcedTeaPrintfCString ("%f", value.f);
@@ -4687,7 +4735,7 @@ IcedTeaJNIEnv::ExpandArgs (JNIID* id, jv
           retstr.AppendInt (args[arg].i);
           break;
         case 'J':
-          retstr.AppendInt (args[arg].j);
+          retstr.AppendInt ((PRUintn) args[arg].j);
           break;
         case 'F':
           retstr += IcedTeaPrintfCString ("%f", args[arg].f);
@@ -5536,19 +5584,14 @@ NSGetFactory (nsISupports* aServMgr, nsC
       return NS_ERROR_OUT_OF_MEMORY;
     }
   nsCString executable (dirname (filename));
-  nsCString jar(dirname (filename));
-  nsCString extrajars("");
+
   free (filename);
   filename = NULL;
 
-  //executableString += nsCString ("/../../bin/pluginappletviewer");
   executable += nsCString ("/../../bin/java");
-
-  //executable += nsCString ("/client/libjvm.so");
 
   // Never freed.
   appletviewer_executable = strdup (executable.get ());
-  //libjvm_so = strdup (executable.get ());
   if (!appletviewer_executable)
     {
       PLUGIN_ERROR ("Failed to create java executable name.");
diff -r ec3687cb7d51 -r c3e121763e20 Makefile.am
--- a/Makefile.am	Mon Oct 27 23:39:36 2008 +0000
+++ b/Makefile.am	Wed Oct 29 18:29:19 2008 +0000
@@ -585,7 +585,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-messageutils.patch \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
-	patches/icedtea-xjc.patch
+	patches/icedtea-xjc.patch \
+	patches/icedtea-renderer-crossing.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -729,6 +730,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
+	mkdir -p rt
 	cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
 endif
 
@@ -1532,10 +1534,16 @@ if ENABLE_GCJWEBPLUGIN
 if ENABLE_GCJWEBPLUGIN
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc
+	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	fi ; \
+	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
+	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
 	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
 	  $(GTK_CFLAGS) $(GTK_LIBS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
 	  -fPIC -shared -o $@ $<
 
 clean-gcjwebplugin:
@@ -1547,8 +1555,14 @@ if ENABLE_PLUGIN
 # is listed before -l options.  See:
 # http://developer.mozilla.org/en/docs/XPCOM_Glue
 IcedTeaPlugin.o: IcedTeaPlugin.cc
+	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	fi ; \
+	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
+	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
 	$(CXX) $(CXXFLAGS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
 	  $(GTK_CFLAGS) \
 	  $(XULRUNNER_CFLAGS) \
 	  -fPIC -c -o $@ $<
@@ -1645,8 +1659,8 @@ endif
 
 clean-pulse-java:
 if ENABLE_PULSE_JAVA
-	rm -rf $(PULSE_JAVA_CLASS_DIR)/*
-	rm -f $(PULSE_JAVA_NATIVE_SRCDIR)/org_*.h
+	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || find $(PULSE_JAVA_CLASS_DIR) -name '*.class' | xargs -r rm -f
+	[ -z "$(PULSE_JAVA_NATIVE_SRCDIR)" ] || rm -f $(PULSE_JAVA_NATIVE_SRCDIR)/org_*.h $(PULSE_JAVA_NATIVE_SRCDIR)/*.o
 	rm -f stamps/pulse-java*.stamp
 	rm -f pulse-java.jar
 	rm -f libpulse-java.so
diff -r ec3687cb7d51 -r c3e121763e20 NEWS
--- a/NEWS	Mon Oct 27 23:39:36 2008 +0000
+++ b/NEWS	Wed Oct 29 18:29:19 2008 +0000
@@ -4,7 +4,7 @@ New in release 1.8 (XXXX-XX-XX)
   IcedTea6 and OpenJDK. The following noteworthy changes were added in
   this release:
 
-- Updated to b36 build.
+- Updated to b38 build.
 - Fixed to use new sound service, Gervill.
 - Many Netx fixes and now built by default.
 - LiveConnect support (--enable-liveconnect).
@@ -22,6 +22,12 @@ New in release 1.8 (XXXX-XX-XX)
 - Add support for Zero builds on alpha, arm, mips, mipsel, m68k, s390.
 - Various build fixes.
 - Several bug and security fixes.
+- Plugin including LiveConnect support built as default.
+- Various bugs fixed: renderer patch, version string updated, 
+chinese fonts filename fix for Fedora etc.
+- More progress on Shark and Cacao.
+- Several plugin bug fixes.
+- Several build fixes.
 
 New in release 1.7 (2008-06-02)
 
diff -r ec3687cb7d51 -r c3e121763e20 gcjwebplugin.cc
--- a/gcjwebplugin.cc	Mon Oct 27 23:39:36 2008 +0000
+++ b/gcjwebplugin.cc	Wed Oct 29 18:29:19 2008 +0000
@@ -84,7 +84,7 @@ exception statement from your version. *
 
 // Plugin information passed to about:plugins.
 #define PLUGIN_NAME "GCJ Web Browser Plugin (using IcedTea)"
-#define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
+#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."



More information about the distro-pkg-dev mailing list