[ooo-build-commit] .: Branch 'ooo-build-3-2' - 3 commits - configure.in patches/dev300

[Kalman "" Szalai]

 configure.in                        |    4 ++--
 patches/dev300/apply                |   17 +++++++++++------
 patches/dev300/scp2_extensions.diff |    2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 329aae373e60d00039d575a44b8dab504a892261
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sun Feb 14 12:15:48 2010 +0100

    Add HyphenFix to OxygenOffice and FSF.hu
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 055fe44..92a7b9e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -142,16 +142,16 @@ GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, I
 OxygenOfficeLinuxCommon :	Common, EMFPlus, FontConfigTemporaryHacks, \
 	      			LinuxOnly, SystemBits, Lockdown, \
 	      			msaccess, OpenGLTransitions, \
-	      			Fpickers, Mono, AddressBooks, QuickStarter, KDE4, IntegrateExtensions, LiberationFontsOnWindows
-OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, OOXMLExport
-OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows
+	      			Fpickers, Mono, AddressBooks, QuickStarter, KDE4, IntegrateExtensions, LiberationFontsOnWindows, HyphenFix
+OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, OOXMLExport, HyphenFix
+OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows, HyphenFix
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
 # FSFhu
-FSFhuWindows : Win32Common, NovellOnly, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
-FSFhuLinux : NovellBase, EMFPlus, CairoFonts, LiberationFontsOnWindows, IntegrateExtensions
-FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
+FSFhuWindows : Win32Common, NovellOnly, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions, HyphenFix
+FSFhuLinux : NovellBase, EMFPlus, CairoFonts, LiberationFontsOnWindows, IntegrateExtensions, HyphenFix
+FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, HyphenFix
 # Plain build; just with base build fixes
 PlainLinux: PlainBuildFixes
 # Experimental crosscompile support
@@ -3551,3 +3551,8 @@ connectivity-build-fix.diff, i#107957, fridrich
 oowintool-java6.diff, fridrich
 connectivity-build-fix-mac.diff, thorsten
 vcl-xinerama-clone-fix.diff, n#578730, thorsten
+
+[ HyphenFix ]
+# László Németh's patch for hyphen module
+# Fix for UTF-8 encoded hyphen dictionaries
+hyphen-2.4.patch.diff, kami
commit 003d3ce3b4b4d107cfd3df279d89c904aa814168
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Fri Feb 12 13:49:40 2010 +0100

    Updated Extension Aids to 20100212
    
    * configure.in:

diff --git a/configure.in b/configure.in
index 62d7455..30af0aa 100644
--- a/configure.in
+++ b/configure.in
@@ -860,7 +860,7 @@ AC_SUBST(CAIRO_CONFIGURE_FLAG)
 PREBUILT_WRITINGAIDS_TIMESTAMP=20091204
 AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
 
-PREBUILT_EXTENSIONAIDS_TIMESTAMP=20100210
+PREBUILT_EXTENSIONAIDS_TIMESTAMP=20100212
 AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
 
 BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
commit 1f0fd8bab2544220db8218b4f76f71541581cf26
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Fri Feb 12 13:45:16 2010 +0100

    Updated Lightproof_hu to 1.1
    
    * configure.in:
    * patches/dev300/scp2_extensions.diff:

diff --git a/configure.in b/configure.in
index f90ec16..62d7455 100644
--- a/configure.in
+++ b/configure.in
@@ -1418,7 +1418,7 @@ if test "$enable_extensions" != "no" ; then
 		if test -n "`echo $with_lang | grep "$lang"`" ; then
 			LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
 			case $lang in
-			"hu") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-hu-1.0.oxt";;
+			"hu") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-hu-1.1.oxt";;
 			"en-US") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-en-US-0.1.oxt";;
 			esac
 		fi
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 5fc943a..ef668f9 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -113,7 +113,7 @@
 +    TXT_FILE_BODY;
 +    Styles = (PACKED);
 +    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name (hu) = "lightproof-hu-1.0.oxt";
++    Name (hu) = "lightproof-hu-1.1.oxt";
 +    Name (en-US) = "lightproof-en-US-0.1.oxt";
 +End
 +