[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - distro-configs/NovellWin32.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Feb 2 02:36:30 PST 2011
distro-configs/NovellWin32.conf.in | 15 ++++++++++
patches/dev300/corporate-dictionary.diff | 8 ++---
patches/dev300/icu-4.2.1.diff | 8 ++---
patches/dev300/novell-win32-installer-branding.diff | 28 ++++++++++----------
patches/dev300/win32-prebuilt-writingaids-zip.diff | 9 +++---
5 files changed, 43 insertions(+), 25 deletions(-)
New commits:
commit 75b5c320bfb98a65edd4531d5a875d3812aa6d46
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Wed Feb 2 03:33:18 2011 -0700
Massage in order to apply
diff --git a/patches/dev300/corporate-dictionary.diff b/patches/dev300/corporate-dictionary.diff
index 740806c..ba56a16 100644
--- a/patches/dev300/corporate-dictionary.diff
+++ b/patches/dev300/corporate-dictionary.diff
@@ -11,8 +11,8 @@ index 7d4e618..62f8318 100644
ZIP1TARGET = $(WORDBOOK_ALL_TARGET)
--ZIP1LIST = oracle.dic
-+ZIP1LIST = oracle.dic Novell.dic
+-ZIP1LIST = technical.dic
++ZIP1LIST = technical.dic Novell.dic
ZIP2TARGET = $(WORDBOOK_USER_TARGET)
@@ -24,8 +24,8 @@ index 7cb13b7..e0828fa 100644
<desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
<label>Custom dictionaries</label>
</info>
-- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;oracle.dic</value>
-+ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;Novell.dic;oracle.dic;corporate.dic</value>
+- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;technical.dic</value>
++ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;Novell.dic;technical.dic;corporate.dic</value>
</prop>
<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
<!-- OldLocation: NEW -->
diff --git a/patches/dev300/icu-4.2.1.diff b/patches/dev300/icu-4.2.1.diff
index 887ef3f..3018ede 100644
--- a/patches/dev300/icu-4.2.1.diff
+++ b/patches/dev300/icu-4.2.1.diff
@@ -897,12 +897,12 @@ index eedf627..1fc9ecb 100755
+++ icu/icuversion.mk
@@ -27,7 +27,7 @@
# major
- ICU_MAJOR=4
+ ICU_MAJOR*=4
# minor
--ICU_MINOR=0
-+ICU_MINOR=2
+-ICU_MINOR*=0
++ICU_MINOR*=2
# micro
- ICU_MICRO=1
+ ICU_MICRO*=1
diff --git icu/makefile.mk icu/makefile.mk
index 2fafcfa..acf0630 100644
diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index ea7ec8e..354b412 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -11,28 +11,30 @@
en-US = "&Next >"
--- instsetoo_native/util/makefile.mk
+++ instsetoo_native/util/makefile.mk
-@@ -372,11 +372,19 @@
- $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+@@ -348,16 +348,16 @@
+ $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+- $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+- $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+- $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+- $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/nologobanner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/nologobanner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/nologobanner_nld.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/nologobanner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/nologobanner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
.IF "$(OS)" == "WNT"
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index d24b7a1..a833350 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,8 +1,9 @@
--- dictionaries/prj/build.lst
+++ dictionaries/prj/build.lst
-@@ -1,35 +1,3 @@
+@@ -1,37 +1,3 @@
-di dictionaries : soltools mythes NULL
--di dictionaries usr1 - all di_mkout NULL
++di dictionaries : NULL
+ di dictionaries usr1 - all di_mkout NULL
-di dictionaries\af_ZA nmake - all di_af_ZA NULL
-di dictionaries\ca nmake - all di_ca NULL
-di dictionaries\cs_CZ nmake - all di_cs_CZ NULL
@@ -24,6 +25,7 @@
-di dictionaries\ne_NP nmake - all di_ne_NP NULL
-di dictionaries\nl_NL nmake - all di_nl_NL NULL
-di dictionaries\no nmake - all di_no NULL
+-di dictionaries\oc_FR nmake - all di_oc_FR NULL
-di dictionaries\pl_PL nmake - all di_pl_PL NULL
-di dictionaries\pt_BR nmake - all di_pt_BR NULL
-di dictionaries\ro nmake - all di_ro NULL
@@ -34,10 +36,9 @@
-di dictionaries\sv_SE nmake - all di_sv_SE NULL
-di dictionaries\sw_TZ nmake - all di_sw_TZ NULL
-di dictionaries\th_TH nmake - all di_th_TH NULL
+-di dictionaries\uk_UA nmake - all di_uk_UA NULL
-di dictionaries\vi nmake - all di_vi NULL
-di dictionaries\zu_ZA nmake - all di_zu_ZA NULL
-+di dictionaries : NULL
-+di dictionaries usr1 - all di_mkout NULL
+di dictionaries\prebuilt nmake - all di_diclst NULL
--- dictionaries/prj/d.lst
+++ dictionaries/prj/d.lst
commit 60e0e9504db52e711dc596b9e3fccdd8a9c34811
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Wed Feb 2 02:37:20 2011 -0700
Stuff-up the NovellWin32 options
diff --git a/distro-configs/NovellWin32.conf.in b/distro-configs/NovellWin32.conf.in
index c61eebf..51a2c7f 100644
--- a/distro-configs/NovellWin32.conf.in
+++ b/distro-configs/NovellWin32.conf.in
@@ -6,3 +6,18 @@
--disable-activex-component
--disable-xrender-link
--without-junit
+--with-nlpsolver
+--with-java-target-version=1.5
+--with-extension-integration
+--enable-wiki-publisher
+--enable-report-builder
+--enable-presenter-console
+--enable-pdfimport
+--enable-nss-module
+--enable-minimizer
+--enable-hids
+--enable-broffice
+--enable-binfilter
+--disable-xrender-link
+--disable-build-mozilla
+--disable-activex-component
\ No newline at end of file
More information about the Libreoffice-commits
mailing list