ooo-build r15575 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 19 14:38:46 2009
New Revision: 15575
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15575&view=rev

Log:
2009-03-19  Petr Mladek  <pmladek suse cz>

	* patches/dev300/jvmfwk-modified-javavendors-xml.diff:
	* patches/dev300/apply: select the java automatically when the system
	  javavendors.xml is modified do not force to do it the user manually
	  (i#99619)
	* patches/dev300/jvmfwk-detect-removed-java.diff: update context to
	  apply



Added:
   trunk/patches/dev300/jvmfwk-modified-javavendors-xml.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/jvmfwk-detect-removed-java.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 19 14:38:46 2009
@@ -518,6 +518,10 @@
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
+# select the java automatically when the system javavendors.xml is modified
+# do not force to do it the user manually
+jvmfwk-modified-javavendors-xml.diff, i#99619, pmladek
+
 [ Fixes <= dev300-m41 <= ooo310-m0 ]
 # find locked certs, fix by Jacob Berkman <jberkman novell com>
 libxmlsec-findcerts-m0.diff, i#76870, pmladek

Modified: trunk/patches/dev300/jvmfwk-detect-removed-java.diff
==============================================================================
--- trunk/patches/dev300/jvmfwk-detect-removed-java.diff	(original)
+++ trunk/patches/dev300/jvmfwk-detect-removed-java.diff	Thu Mar 19 14:38:46 2009
@@ -180,11 +180,11 @@
 --- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.old	2006-09-16 19:45:14.000000000 +0200
 +++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2007-10-30 21:04:14.000000000 +0100
 @@ -104,7 +104,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-         fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
-         return -1;
-     }
--    else if (errcode != JFW_E_NONE)
-+    else if (errcode != JFW_E_NONE && errcode != JFW_E_TRY_AUTOSELECT)
+     JavaInfo * pInfo = NULL;
+     errcode = jfw_getSelectedJRE( & pInfo);
+ 
+-    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
++    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS && errcode != JFW_E_TRY_AUTOSELECT)
      {
          fprintf(stderr,"javaldx failed! \n");
          return -1;

Added: trunk/patches/dev300/jvmfwk-modified-javavendors-xml.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/jvmfwk-modified-javavendors-xml.diff	Thu Mar 19 14:38:46 2009
@@ -0,0 +1,16 @@
+--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.old	2009-01-21 15:49:34.000000000 +0100
++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2009-03-19 14:38:21.000000000 +0100
+@@ -82,12 +82,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+     JavaInfo * pInfo = NULL;
+     errcode = jfw_getSelectedJRE( & pInfo);
+ 
+-    if (errcode == JFW_E_INVALID_SETTINGS)
+-    {
+-        fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
+-        return -1;
+-    }
+-    else if (errcode != JFW_E_NONE)
++    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
+     {
+         fprintf(stderr,"javaldx failed! \n");
+         return -1;