[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/64bit patches/dev300

[Hanno Meyer-Thurow]

 patches/64bit/64bit-jdk-server-paths.diff |    6 ++++--
 patches/dev300/disable-python.diff        |   18 ++++++++----------
 patches/dev300/jvm-search-path.diff       |    4 ++--
 patches/dev300/system-db-check.diff       |    2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 338532ad4e47a8455f32726e0d86a6f4c70829ea
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Mon Dec 6 19:47:20 2010 +0100

    (GentooOnly) Fix apply of some patches.
    
    * patches/64bit/64bit-jdk-server-paths.diff:
    * patches/dev300/disable-python.diff:
    * patches/dev300/jvm-search-path.diff:
    * patches/dev300/system-db-check.diff:

diff --git a/patches/64bit/64bit-jdk-server-paths.diff b/patches/64bit/64bit-jdk-server-paths.diff
index 768de70..4cceec2 100644
--- a/patches/64bit/64bit-jdk-server-paths.diff
+++ b/patches/64bit/64bit-jdk-server-paths.diff
@@ -1,10 +1,12 @@
 --- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig	2006-05-21 21:05:55.000000000 +0200
 +++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	2006-05-21 21:45:05.000000000 +0200
-@@ -90,6 +91,7 @@
+@@ -90,9 +91,7 @@
      static char const * ar[] = {
  
          "/lib/" JFW_PLUGIN_ARCH "/client",
-+        "/lib/" JFW_PLUGIN_ARCH "/server",
+-#if defined(OPENBSD)
+         "/lib/" JFW_PLUGIN_ARCH "/server",
+-#endif
          "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
          "/lib/" JFW_PLUGIN_ARCH
  
diff --git a/patches/dev300/disable-python.diff b/patches/dev300/disable-python.diff
index 2bdbeac..8445c9a 100644
--- a/patches/dev300/disable-python.diff
+++ b/patches/dev300/disable-python.diff
@@ -1,9 +1,9 @@
 --- configure.in.orig	2010-01-02 16:33:48.000000000 +0100
 +++ configure.in	2010-01-02 16:44:30.000000000 +0100
 @@ -215,6 +215,9 @@
-                           options and therefore removes a lot of warnings when
                            using the cheaper standard compiler. )
  ],,)
+ 
 +AC_ARG_ENABLE(python,
 +[  --disable-python         Disable build of Python 2.x UNO API
 +],,)
@@ -163,20 +163,18 @@
 +#endif
 --- scp2/source/python/module_python_mailmerge.scp.orig	2010-01-02 17:44:38.000000000 +0100
 +++ scp2/source/python/module_python_mailmerge.scp	2010-01-02 17:44:51.000000000 +0100
-@@ -30,6 +30,8 @@
- 
+@@ -30,6 +30,7 @@
  #include "macros.inc"
  
+ #ifndef AIX
 +#ifndef DISABLE_PYUNO
-+
  File gid_File_Pymailmerge
      TXT_FILE_BODY;
      Dir = gid_Dir_Program;
-@@ -37,3 +39,5 @@
-     RegistryID = gid_Starregistry_Services_Rdb;
+@@ -37,3 +39,4 @@
      Styles = (PACKED,UNO_COMPONENT);
  End
-+
+ #endif
 +#endif
 --- scp2/source/ooo/makefile.mk.orig	2010-01-02 17:47:45.000000000 +0100
 +++ scp2/source/ooo/makefile.mk	2010-01-02 17:48:19.000000000 +0100
@@ -250,8 +248,8 @@
  .ENDIF			# "$(LOCALPYFILES)"!=""
  
  $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
- 	@$(COPY) $< $@
+     @$(COPY) $< $@
 +.ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
  
- $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
- 	$(COPY) $< $@
+ $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand$/intro.zip
+     $(COPY) $< $@
diff --git a/patches/dev300/jvm-search-path.diff b/patches/dev300/jvm-search-path.diff
index 256164a..8f94971 100644
--- a/patches/dev300/jvm-search-path.diff
+++ b/patches/dev300/jvm-search-path.diff
@@ -1,9 +1,9 @@
 --- configure.in.orig	2009-04-06 15:15:26.000000000 +0200
 +++ configure.in	2009-04-06 15:32:04.000000000 +0200
 @@ -614,6 +614,14 @@
-  
-                           Usage: --with-java-target-version=<jvm version>
+                            plugin
  ],,)
+ 
 +AC_ARG_WITH(jvm-path,
 +[  --with-jvm-path         Use a specific JVM search path at runtime.
 +
diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index d4f58e7..4ab65e8 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -48,7 +48,7 @@
 --- set_soenv.in.orig	2007-07-15 16:45:39.000000000 +0200
 +++ set_soenv.in	2007-07-15 16:48:37.000000000 +0200
 @@ -1832,6 +1832,8 @@
- ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
+ ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
  ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
  ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 +ToFile( "DB_LIB",            "@DB_LIB@",           "e" );