[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                |    4 ----
 patches/dev300/buildfix-qadevOOo-java-encoding.diff |   20 --------------------
 2 files changed, 24 deletions(-)

New commits:
commit 91e32e790b6f31526c89f353cf69f8c72159a722
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 18:56:14 2011 +0200

    pushed buildfix-qadevOOo-java-encoding.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a6150e8..70b3436 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -209,10 +209,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 # gij/libgcj paths...
 jvmfwk-gij-paths.diff, rengelha
 
-# Fix up Javac error, known to happen with gcj, probably happens for other
-# JDKs too
-buildfix-qadevOOo-java-encoding.diff, brosenk
-
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
 # Make the scroll-wheel / page popup more sane
diff --git a/patches/dev300/buildfix-qadevOOo-java-encoding.diff b/patches/dev300/buildfix-qadevOOo-java-encoding.diff
deleted file mode 100644
index a5801c0..0000000
--- a/patches/dev300/buildfix-qadevOOo-java-encoding.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- qadevOOo/build.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git qadevOOo/build.xml qadevOOo/build.xml
-index f1d1838..280decf 100755
---- qadevOOo/build.xml
-+++ qadevOOo/build.xml
-@@ -19,7 +19,7 @@
- 
-   <!-- target for building the runner -->
-   <target name="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
-+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true">
-         <classpath>
-             <pathelement location="${qadevOOo.class}"/>
-             <fileset dir="${qadevOOo.office_jars}">
--- 
-1.7.0.1
-