[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - lucene/lucene-java-version.patch solenv/gbuild

[Jim Jagielski]

 lucene/lucene-java-version.patch |   20 ++++++++++----------
 solenv/gbuild/platform/macosx.mk |    2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 08c3b36e02e8c52597dc595b2b832390b3aa3147
Author: Jim Jagielski <jim at apache.org>
Date:   Mon Mar 19 16:53:04 2018 +0000

    Use gcc3 for COMID for macOS/OSX

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a57f7347628c..6bcd3a998ccd 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,8 +22,6 @@
 
 
 GUI := UNX
-COM := S5ABI
-COMID := s5abi
 #COM := S5ABI
 #COMID := s5abi
 
commit 146c1088dc5078c1722b37a9c84fdae6b4de2027
Author: Jim Jagielski <jim at apache.org>
Date:   Mon Mar 19 15:14:19 2018 +0000

    More EOL foolishness

diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
index 626be2a8d1ed..c22e7fc94aa3 100644
--- a/lucene/lucene-java-version.patch
+++ b/lucene/lucene-java-version.patch
@@ -27,13 +27,13 @@
 --- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2010-11-28 02:22:11.000000000 +0200
 +++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2018-03-05 06:41:07.207097100 +0200
 @@ -23,8 +23,8 @@
-     Smart Chinese Analyzer
-   </description>
- 
--  <property name="javac.source" value="1.4" />
--  <property name="javac.target" value="1.4" />
-+  <property name="javac.source" value="1.6" />
-+  <property name="javac.target" value="1.6" />
- 	
-   <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
-   <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
+     Smart Chinese Analyzer
+   </description>
+ 
+-  <property name="javac.source" value="1.4" />
+-  <property name="javac.target" value="1.4" />
++  <property name="javac.source" value="1.6" />
++  <property name="javac.target" value="1.6" />
+ 	
+   <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
+   <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />