[ooo-build-commit] .: 2 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Jun 28 09:44:21 PDT 2010
patches/dev300/apply | 2
patches/dev300/extensions_configure.diff | 2
patches/dev300/liberation_packaging_fix.diff | 51 ------
patches/dev300/novell-win32-registry-branding.diff | 76 +++++-----
patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff | 4
patches/dev300/win32-prebuilt-writingaids-zip.diff | 9 -
6 files changed, 48 insertions(+), 96 deletions(-)
New commits:
commit 34fdb922465049f7a971ac0ebe4721e7d3ebb1b6
Author: OpenOffice.org <ooo at bill.(none)>
Date: Mon Jun 28 18:15:05 2010 +0200
Making patch.apply on Windows
* patches/dev300/apply:
* patches/dev300/extensions_configure.diff:
* patches/dev300/liberation_packaging_fix.diff:
* patches/dev300/novell-win32-registry-branding.diff:
* patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff:
* patches/dev300/win32-prebuilt-writingaids-zip.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index af5a278..68868f8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1328,7 +1328,7 @@ system-python-uno-path.diff, i#97629
# Use Liberation fonts on Windows, too
liberation_packaging_fix.diff, kami
-liberation_making_fix.diff, kami
+#liberation_making_fix.diff, kami
[ VCL ]
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 98a71d2..21caa73 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -306,4 +306,4 @@
+dnl ===================================================================
dnl Test whether to include fonts
dnl ===================================================================
- AC_MSG_CHECKING([whether to include Bitstream Vera fonts])
+ AC_MSG_CHECKING([whether to include third-party fonts])
diff --git a/patches/dev300/liberation_packaging_fix.diff b/patches/dev300/liberation_packaging_fix.diff
index 01b67d5..1a3fd01 100644
--- a/patches/dev300/liberation_packaging_fix.diff
+++ b/patches/dev300/liberation_packaging_fix.diff
@@ -1,28 +1,13 @@
---- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
-+++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
-@@ -134,78 +134,54 @@
+--- scp2/source/ooo/file_font_ooo.scp 2010-06-18 10:31:50.000000000 +0200
++++ scp2/source/ooo/file_font_ooo.scp 2010-06-28 17:00:38.953125000 +0200
+@@ -91,33 +91,27 @@
// Liberation Mono
#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
#endif
-#endif
@@ -31,23 +16,8 @@
#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
#endif
-#endif
@@ -56,23 +26,8 @@
#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
#endif
-#endif
diff --git a/patches/dev300/novell-win32-registry-branding.diff b/patches/dev300/novell-win32-registry-branding.diff
index 8839167..38d5771 100644
--- a/patches/dev300/novell-win32-registry-branding.diff
+++ b/patches/dev300/novell-win32-registry-branding.diff
@@ -26,13 +26,13 @@
dummy line to avoid confusing diff-mode
--- solenv/bin/modules/installer/windows/registry.pm
+++ solenv/bin/modules/installer/windows/registry.pm
-@@ -179,6 +179,9 @@
-
- $value =~ s/\\\"/\"/g; # no more masquerading of '"'
- $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
+@@ -205,6 +205,9 @@
+ $value =~ s/\\\"/\"/g; # no more masquerading of '"'
+ $value =~ s/\\\\\s*$/\\/g; # making "\\" at end of value to "\"
+ $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
+ $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
+ $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
+ $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
- $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+ $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/; # removing "\" after "[INSTALLLOCATION]"
- if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
+ if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff b/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
index 3bbb106..224a4a4 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
@@ -12,6 +12,6 @@
sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL
--sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-+sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
+-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
++sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index 8472aa2..2af369e 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,6 +1,6 @@
--- dictionaries/prj/build.lst
+++ dictionaries/prj/build.lst
-@@ -1,37 +1,3 @@
+@@ -1,34 +1,3 @@
-di dictionaries : soltools NULL
-di dictionaries usr1 - all di_mkout NULL
-di dictionaries\af_ZA nmake - all di_af_ZA NULL
@@ -10,11 +10,7 @@
-di dictionaries\de_AT nmake - all di_de_AT NULL
-di dictionaries\de_CH nmake - all di_de_CH NULL
-di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH NULL
--di dictionaries\en_US nmake - all di_en_US NULL
--di dictionaries\en_ZA nmake - all di_en_ZA NULL
--di dictionaries\en_AU nmake - all di_en_AU NULL
--di dictionaries\en_CA nmake - all di_en_CA NULL
--di dictionaries\en_GB nmake - all di_en_GB di_en_US di_en_ZA di_en_ZA di_en_AU NULL
+-di dictionaries\en nmake - all di_en NULL
-di dictionaries\es_ES nmake - all di_es_ES NULL
-di dictionaries\et_EE nmake - all di_et_EE NULL
-di dictionaries\fr_FR nmake - all di_fr_FR NULL
@@ -22,6 +18,7 @@
-di dictionaries\he_IL nmake - all di_he_IL NULL
-di dictionaries\hu_HU nmake - all di_hu_HU NULL
-di dictionaries\it_IT nmake - all di_it_IT NULL
+-di dictionaries\ku_TR nmake - all di_ku_TR NULL
-di dictionaries\lt_LT nmake - all di_lt_LT NULL
-di dictionaries\ne_NP nmake - all di_ne_NP NULL
-di dictionaries\nl_NL nmake - all di_nl_NL NULL
commit 80e66adb78bcc2847b2835b2c0404a73cae51cbf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Jun 28 18:43:24 2010 +0200
Use unix line ends in the patch
* patches/dev300/novell-win32-registry-branding.diff:
diff --git a/patches/dev300/novell-win32-registry-branding.diff b/patches/dev300/novell-win32-registry-branding.diff
index 38c75a4..8839167 100644
--- a/patches/dev300/novell-win32-registry-branding.diff
+++ b/patches/dev300/novell-win32-registry-branding.diff
@@ -1,38 +1,38 @@
---- scp2/source/ooo/registryitem_ooo.scp
-+++ scp2/source/ooo/registryitem_ooo.scp
-@@ -393,6 +393,22 @@
- Value = "<progpath>\program\soffice.exe";
- End
-
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_PackageVersion
-+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
-+ ModuleID = gid_Module_Root;
-+ Name = "PackageVersion";
-+ Value = "<ooo_packageversion>";
-+End
-+
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_BuildVersion
-+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
-+ ModuleID = gid_Module_Root;
-+ Name = "BuildVersion";
-+ Value = "<buildversion>";
-+End
-+
- RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-dummy line to avoid confusing diff-mode
---- solenv/bin/modules/installer/windows/registry.pm
-+++ solenv/bin/modules/installer/windows/registry.pm
-@@ -179,6 +179,9 @@
-
- $value =~ s/\\\"/\"/g; # no more masquerading of '"'
- $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
-+ $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
-+ $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
-+ $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
- $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
-
- if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
+--- scp2/source/ooo/registryitem_ooo.scp
++++ scp2/source/ooo/registryitem_ooo.scp
+@@ -393,6 +393,22 @@
+ Value = "<progpath>\program\soffice.exe";
+ End
+
++RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_PackageVersion
++ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
++ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
++ ModuleID = gid_Module_Root;
++ Name = "PackageVersion";
++ Value = "<ooo_packageversion>";
++End
++
++RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_BuildVersion
++ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
++ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Novell";
++ ModuleID = gid_Module_Root;
++ Name = "BuildVersion";
++ Value = "<buildversion>";
++End
++
+ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+ Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+dummy line to avoid confusing diff-mode
+--- solenv/bin/modules/installer/windows/registry.pm
++++ solenv/bin/modules/installer/windows/registry.pm
+@@ -179,6 +179,9 @@
+
+ $value =~ s/\\\"/\"/g; # no more masquerading of '"'
+ $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
++ $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
++ $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
++ $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
+ $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+
+ if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
More information about the ooo-build-commit
mailing list