[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                    |    2 ++
 patches/dev300/odk-unowinreg-osdir.diff |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit cbfe183f5f669daea3dd91d13fea47b2ddc8e370
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 21 18:53:02 2009 +0100

    fix unowinreg.dll build with gcj
    
    * patches/dev300/odk-unowinreg-osdir.diff: add -I.../<os> also for gcj
    * patches/dev300/apply: add new patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5c4f484..4d7fe70 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1259,6 +1259,8 @@ stlport-gcc-warnings.diff, i#100223, gokcen
 
 [ SdkFixes ]
 odk-remove-nonexisting-package.diff, i#105803
+# fix gcj builds. we need to specify the -I.../<os> there, too
+odk-unowinreg-osdir.diff
 
 [ DebianOnly ]
 seamonkey-is-iceape.diff
diff --git a/patches/dev300/odk-unowinreg-osdir.diff b/patches/dev300/odk-unowinreg-osdir.diff
new file mode 100644
index 0000000..f118f25
--- /dev/null
+++ b/patches/dev300/odk-unowinreg-osdir.diff
@@ -0,0 +1,18 @@
+--- odk/source/unowinreg/win/makefile.mk-old	2009-12-21 08:20:26.000000000 -0700
++++ odk/source/unowinreg/win/makefile.mk	2009-12-21 08:16:54.000000000 -0700
+@@ -46,7 +46,6 @@
+ JAVA_INCLUDES:= -I$(JAVA_HOME)/include 
+ 
+ # values taken from set_soenv.in
+-.IF "$(JDK)" != "gcj"
+ .IF "$(OS)" == "LINUX"
+ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
+ .ELIF "$(OS)" == "FREEBSD"
+@@ -58,7 +57,6 @@
+ .ELIF "$(OS)" == "IRIX"
+ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/solaris
+ .ENDIF
+-.ENDIF
+ 
+ .IF "$(SOLAR_JAVA)"==""
+ nojava: