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

[Tor Lillqvist]

 patches/dev300/fields-table-formula.diff            |    6 +++++-
 patches/dev300/novell-win32-installer-branding.diff |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dbfe01c24285dff6147a9b01b5ebffd6545020b1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Oct 2 01:16:00 2010 +0300

    Make patch apply again

diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 5e5b757..e2bb92c 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -45,7 +45,7 @@
 +            DOWNLOADSETUPICO	ooosetup_nld.ico
  			RELATIVE_PATHES_IN_DDF 1
              STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
-             STARTCENTER_INFO_URL http://www.go-oo.org
+             STARTCENTER_INFO_URL http://www.documentfoundation.org/
 @@ -76,9 +76,9 @@
  			LIBRARYVERSION 9.3.0
  			PATCHCODEFILE ooo_patchcodes.txt
commit 44d3f1760f8fe5ba36c11f0f83d93f0b62e4a8c6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Oct 2 00:48:48 2010 +0300

    Link with BOOSTTHREADLIB on Windows

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index 0ce607d..ea06980 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -1062,13 +1062,17 @@ diff --git sw/util/makefile.mk sw/util/makefile.mk
 index 24ad295..7625b28 100644
 --- sw/util/makefile.mk
 +++ sw/util/makefile.mk
-@@ -120,7 +120,8 @@ SHL1STDLIBS+= \
+@@ -120,7 +120,12 @@ SHL1STDLIBS+= \
      $(ICUUCLIB) \
      $(I18NUTILLIB)
  SHL1STDLIBS+= \
 -    $(AVMEDIALIB)
 +    $(AVMEDIALIB) \
 +	$(IXIONLIB)
++.IF "$(GUI)"=="WNT"
++SHL1STDLIBS+= \
++    $(BOOSTTHREADLIB)
++.ENDIF
  
  .IF "$(GUI)"=="WNT"
  SHL1STDLIBS+= $(ADVAPI32LIB)