/hg/icedtea-web: 2 new changesets

[dbhole at icedtea.classpath.org]

changeset 418a9e44fce7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=418a9e44fce7
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Sep 13 16:19:47 2011 -0400

	Fixed formatting issues in previous entry.


changeset d2434b3dc395 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d2434b3dc395
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Sep 13 16:23:04 2011 -0400

	PR782: Support building against npapi-sdk as well Patch from Micha?
	G?rny < mgorny at gentoo dot org >


diffstat:

 AUTHORS      |   1 +
 ChangeLog    |  30 ++++++++++++++++++++----------
 NEWS         |   1 +
 acinclude.m4 |  11 +++++++++--
 4 files changed, 31 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r 68a6e5d41dfc -r d2434b3dc395 AUTHORS
--- a/AUTHORS	Thu Sep 01 12:18:55 2011 +0200
+++ b/AUTHORS	Tue Sep 13 16:23:04 2011 -0400
@@ -9,6 +9,7 @@
 Mark Greenwood <mark at dcs.shef.ac.uk>
 Andrew John Hughes <ahughes at redhat.com>
 Matthias Klose <doko at ubuntu.com>
+Michał Górny < mgorny at gentoo.org >
 Francis Kung <fkung at redhat.com>
 Denis Lila <dlila at redhat.com>
 DJ Lucas <dj at lucasit.com>
diff -r 68a6e5d41dfc -r d2434b3dc395 ChangeLog
--- a/ChangeLog	Thu Sep 01 12:18:55 2011 +0200
+++ b/ChangeLog	Tue Sep 13 16:23:04 2011 -0400
@@ -1,15 +1,25 @@
+2011-09-13  Deepak Bhole <dbhole at redhat.com>
+
+	PR782: Support building against npapi-sdk as well
+	Patch from Michał Górny < mgorny at gentoo dot org >
+	* acinclude.m4: Build against npapi-sdk.
+
+2011-09-13  Deepak Bhole <dbhole at redhat.com>
+
+	* ChangeLog: Fixed formatting issues in previous entry.
+
 2011-09-01 Jiri Vanek<jvanek at redhat.com>
 	Added functionality to allow icedtea web to be buildable with
-	 rhel5 libraries.
-	*configure.ac: added IT_CHECK_GLIB_VERSION check.
-	*acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test.
-	  version of glib installed and add LEGACY_GLIB define macro into
-	  variable DEFS if version is <2.16.
-	*plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible
-	 functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB
-	 is defined. Added define sections for use this function instead of glib ones.
-	 Duplicated code moved into function getFirstInTableInstance(GHashTble* table).
-	*Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation 
+	rhel5 libraries.
+	* configure.ac: added IT_CHECK_GLIB_VERSION check.
+	* acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test.
+	version of glib installed and add LEGACY_GLIB define macro into
+	 variable DEFS if version is <2.16.
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible
+	functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB
+	is defined. Added define sections for use this function instead of glib ones.
+	Duplicated code moved into function getFirstInTableInstance(GHashTble* table).
+	* Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation 
 
 2011-08-29  Deepak Bhole <dbhole at redhat.com>
 
diff -r 68a6e5d41dfc -r d2434b3dc395 NEWS
--- a/NEWS	Thu Sep 01 12:18:55 2011 +0200
+++ b/NEWS	Tue Sep 13 16:23:04 2011 -0400
@@ -16,6 +16,7 @@
   - PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application
 * Plugin
   - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
+  - PR782: Support building against npapi-sdk as well
   - RH718693: MindTerm SSH Applet doesn't work
 Common
   - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
diff -r 68a6e5d41dfc -r d2434b3dc395 acinclude.m4
--- a/acinclude.m4	Thu Sep 01 12:18:55 2011 +0200
+++ b/acinclude.m4	Tue Sep 13 16:23:04 2011 -0400
@@ -372,8 +372,15 @@
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
 
-  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-    
+  PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
+    AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
+      # XXX: use NPAPI versions instead
+      xulrunner_cv_collapsed_version=20000000
+    ])
+  ], [
+    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+  ])
+
   AC_SUBST(MOZILLA_CFLAGS)
   AC_SUBST(MOZILLA_LIBS)
 fi