Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49cc517d35d8d148e109843aaa38f389151fa277

commit 49cc517d35d8d148e109843aaa38f389151fa277
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Apr 14 02:11:09 2010 +0200

openoffice.org-3.2.0-2-i686

- backport 7329c58 from git
- closes #4173

diff --git a/source/xapps/openoffice.org/7329c58.patch 
b/source/xapps/openoffice.org/7329c58.patch
new file mode 100644
index 0000000..af2ae27
--- /dev/null
+++ b/source/xapps/openoffice.org/7329c58.patch
@@ -0,0 +1,44 @@
+From 7329c58a8d07f64cea150d703b4b0b99a60d6e55 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kyosh...@novell.com>
+Date: Tue, 23 Feb 2010 07:57:36 -0500
+Subject: [PATCH] Fixed failed date detection that forced input date to 0.
+
+* patches/dev300/svtools-uninitialized-member-fix.diff: the old format
+  type was incorrectly reset which caused input date to become '0' in
+  the Hungarian locale if the number format was pre-set. (n#581634)
+---
+ .../dev300/svtools-uninitialized-member-fix.diff   |   21 +++++++++++--------
+ 1 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/patches/dev300/svtools-uninitialized-member-fix.diff 
b/patches/dev300/svtools-uninitialized-member-fix.diff
+index 2af7878..e538739 100644
+--- a/patches/dev300/svtools-uninitialized-member-fix.diff
++++ b/patches/dev300/svtools-uninitialized-member-fix.diff
+@@ -1,12 +1,15 @@
+ diff --git svtools/source/numbers/zforfind.cxx 
svtools/source/numbers/zforfind.cxx
+-index 9fba39e..872ada2 100644
++index 9fba39e..fbf1dc1 100644
+ --- svtools/source/numbers/zforfind.cxx
+ +++ svtools/source/numbers/zforfind.cxx
+-@@ -138,6 +138,7 @@ void ImpSvNumberInputScan::Reset()
+-     nAnzNums     = 0;
+-     nThousand    = 0;
+-     eScannedType = NUMBERFORMAT_UNDEFINED;
+-+    eSetType     = NUMBERFORMAT_UNDEFINED;
+-     nAmPm        = 0;
+-     nPosThousandString = 0;
+-     nLogical     = 0;
++@@ -87,7 +87,9 @@ ImpSvNumberInputScan::ImpSvNumberInputScan( 
SvNumberFormatter* pFormatterP )
++         pUpperMonthText( NULL ),
++         pUpperAbbrevMonthText( NULL ),
++         pUpperDayText( NULL ),
++-        pUpperAbbrevDayText( NULL )
+++        pUpperAbbrevDayText( NULL ),
+++        eScannedType( NUMBERFORMAT_UNDEFINED ),
+++        eSetType( NUMBERFORMAT_UNDEFINED )
++ {
++     pFormatter = pFormatterP;
++     pNullDate = new Date(30,12,1899);
+--
+1.7.0
+
diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index d141737..aaa9e3d 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -10,7 +10,7 @@ if ! Fuse $USE_DEVEL; then
tree=ooo320
milestone=12
pkgver=$upstream
-       pkgrel=1
+       pkgrel=2
snapshot=0-5-7-g045191c
else
upstream=3.2.0
@@ -34,7 +34,7 @@ rodepends=('flac' 'dejavu-ttf')
makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' \
'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' \
-            'procps' 'openldap' 'gperf' 'xulrunner')
+            'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime')
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
@@ -42,8 +42,8 @@ if ! Fuse $USE_DEVEL; then
else
up2date="lynx -source -dump 
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/configure.in?h=ooo-build$branch
 |grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
-source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
 
http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2
 package-ooo.diff)
-signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 
'' '' '')
+source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
 
http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2
 package-ooo.diff 7329c58.patch)
+signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 
'' '' '' '')
NOEXTRACT=1
options=(${optio...@]} 'scriptlet')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to