[ooo-build-commit] .: 2 commits - patches/dev300

[Hanno Meyer-Thurow]

 patches/dev300/apply                     |   10 ++--------
 patches/dev300/buildfix-vba-as-extn.diff |   10 ----------
 patches/dev300/jemalloc.diff             |    8 ++++----
 patches/dev300/jvm-search-path.diff      |    4 ++--
 patches/dev300/system-db-check.diff      |    2 +-
 5 files changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 3a11ee410ec2176670c68d3ab3bb64625ecaa391
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Thu Mar 4 16:32:27 2010 +0100

    Remove obsolete buildfix-vba-as-extn.diff
    
    * patches/dev300/apply: update
    * patches/dev300/buildfix-vba-as-extn.diff: remove

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cf0d1a7..b6c560f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1761,9 +1761,6 @@ vba-ide-choose-macro-to-run.diff, noelpwer
 # Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
 vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
 
-# fix build with vba as extension
-buildfix-vba-as-extn.diff, i#86937, hmth
-
 # Parse (& ignore) 'Attribute' statements
 vba-attribute.diff, i#37347, noelpwer
 #basic depends on built and delivered ooovbaapi
diff --git a/patches/dev300/buildfix-vba-as-extn.diff b/patches/dev300/buildfix-vba-as-extn.diff
deleted file mode 100644
index bff04eb..0000000
--- a/patches/dev300/buildfix-vba-as-extn.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- sc/util/makefile.mk.orig	2008-03-11 18:36:44.000000000 +0100
-+++ sc/util/makefile.mk	2008-03-11 18:36:54.000000000 +0100
-@@ -300,6 +300,7 @@
- 
- .INCLUDE :  target.mk
- 
-+COMP=
- .IF "$(VBA_EXTENSION)"=="YES"
-     COMP=build_extn
- .ENDIF
commit 8e0ee8b3ed8ad73cfe7f405808c4e98ba2600380
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Thu Mar 4 16:29:35 2010 +0100

    Defuzz Gentoo Patches
    
    * patches/dev300/apply
    * patches/dev300/jemalloc.diff
    * patches/dev300/jvm-search-path.diff
    * patches/dev300/system-db-check.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bff6270..cf0d1a7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1602,11 +1602,6 @@ win32-no-uninstall-survey.diff, tml
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
 
-[ GentooExperimental ]
-SectionOwner => hmth
-# jemalloc, FreeBSD 7 allocator
-jemalloc.diff
-
 [ GentooOnly ]
 SectionOwner => aprosky
 
@@ -3583,6 +3578,8 @@ calc-insert-current-time-vcl.diff,       kohei
 
 [ GentooExperimental ]
 SectionOwner => hmth
+# jemalloc, FreeBSD 7 allocator
+jemalloc.diff
 # make Python2 optional
 disable-python.diff
 # disable qadevooo => disable testshl2
diff --git a/patches/dev300/jemalloc.diff b/patches/dev300/jemalloc.diff
index df65e33..8ac614f 100644
--- a/patches/dev300/jemalloc.diff
+++ b/patches/dev300/jemalloc.diff
@@ -5,10 +5,10 @@
  AC_ARG_WITH(alloc,
  [  --with-alloc            Define which allocator to build with
 -			                 (choices are oo, system, tcmalloc)
-+			  (choices are oo, system, tcmalloc, jemalloc)
++                           (choices are oo, system, tcmalloc, jemalloc)
  ],,)
- 
- BUILD_TYPE="OOo EXT"
+ AC_ARG_WITH(sun-templates,
+ [
 @@ -2499,6 +2499,14 @@
          [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
      ALLOC="TCMALLOC";
@@ -41,7 +41,7 @@ Index: unxlng.mk
 +.ENDIF
 +
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
- LINKFLAGS += -Wl,--hash-style=both
+ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ELSE
 --- sal/rtl/source/makefile.mk.orig	2008-03-18 19:41:00.000000000 +0100
 +++ sal/rtl/source/makefile.mk	2008-03-18 19:42:42.000000000 +0100
diff --git a/patches/dev300/jvm-search-path.diff b/patches/dev300/jvm-search-path.diff
index 47473b1..256164a 100644
--- a/patches/dev300/jvm-search-path.diff
+++ b/patches/dev300/jvm-search-path.diff
@@ -50,8 +50,8 @@
     ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
 +   ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
  }
- if ( $platform =~ m/darwin/ )
- {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
+ ToFile( "SCPDEFS",           '@SCPDEFS@',        "e" );
+ ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
 --- jvmfwk/plugins/sunmajor/pluginlib/makefile.mk.orig	2009-04-06 14:38:34.000000000 +0200
 +++ jvmfwk/plugins/sunmajor/pluginlib/makefile.mk	2009-04-06 14:40:44.000000000 +0200
 @@ -84,6 +84,10 @@
diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index 2a56d7a..142eae8 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -61,7 +61,7 @@
  ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
 --- solenv/inc/libs.mk.orig	2007-07-15 16:45:47.000000000 +0200
 +++ solenv/inc/libs.mk	2007-07-15 16:49:00.000000000 +0200
-@@ -220,8 +220,8 @@
+@@ -220,7 +220,7 @@
  NEON3RDLIB=-lneon
  .ENDIF
  .IF "$(SYSTEM_DB)" == "YES"