From b29bb2dbee8137ef5ff240588cf2269edc9428fd Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Fri, 15 Jan 2010 14:55:12 +0100
Subject: ause110: #i106731# remove tarballs from scm and find them in download
 cache dir

---
 rhino/makefile.mk                 | 1 +
 rhino/rhino1_5R5-find_swing.patch | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'rhino')

diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 0809007ea7b4..5244af24f5d7 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -43,6 +43,7 @@ TARGET=ooo_rhino
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=rhino1_5R5
+TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685
 TARFILE_ROOTDIR=rhino1_5R5
 
 ADDITIONAL_FILES= \
diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch
index e94974a41574..220c4f4e668a 100644
--- a/rhino/rhino1_5R5-find_swing.patch
+++ b/rhino/rhino1_5R5-find_swing.patch
@@ -1,13 +1,11 @@
 --- misc/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:46.605524507 +0100
 +++ misc/build/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:26.536908810 +0100
-@@ -12,6 +12,10 @@
+@@ -12,6 +12,8 @@
        <os family="unix"/>
      </and>
    </condition>
 +  <property environment="solenv"/>
-+  <condition property="swing_zip" value="${solenv.TARFILE_LOCATION}/swingExSrc.zip" else="../../../../../download/swingExSrc.zip">
-+	<isset property="solenv.TARFILE_LOCATION" />
-+  </condition>
++  <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
    <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
    <!-- rhino.jar from OpenJDK breaks build -->
    <path id="nonMacPath">
-- 
cgit