package/office/openoffice/OOo-use_bin_hsqldb.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../openoffice-org/OOo-use_bin_hsqldb.patch
   5 # Copyright (C) 2007 - 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
  18 Date: 2007-06-24
  19 Initial Package Version: 2.2.1
  20 Upstream Status: Not applicable
  21 Origin: Self
  22 Description: Uses the pre-built jar instead of recompiling hsqldb, which will
  23 not compile with JDK-6.  Upstream hsqldb is targeting 1.9.0 which is currently
  24 incompatible with 1.8.0.x.
  25
  26 --- OpenOffice-2.2.1-orig/hsqldb/makefile.mk    2006-12-01 17:33:12.000000000 +0000
  27 +++ OpenOffice-2.2.1/hsqldb/makefile.mk 2007-06-22 23:29:30.000000000 +0000
  28 @@ -61,17 +61,17 @@
  29                         patches$/i103528.patch \
  30                         patches$/i104901.patch
  31
  32 -.IF "$(JAVACISGCJ)"=="yes"
  33 -JAVA_HOME=
  34 -.EXPORT : JAVA_HOME
  35 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  36 -.ELSE
  37 -.IF "$(debug)"!=""
  38 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar
  39 -.ELSE
  40 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  41 -.ENDIF
  42 -.ENDIF
  43 +#.IF "$(JAVACISGCJ)"=="yes"
  44 +#JAVA_HOME=
  45 +#.EXPORT : JAVA_HOME
  46 +#BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  47 +#.ELSE
  48 +#.IF "$(debug)"!=""
  49 +#BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar
  50 +#.ELSE
  51 +#BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  52 +#.ENDIF
  53 +#.ENDIF
  54
  55  .ENDIF # $(SOLAR_JAVA)!= ""
  56