[Frugalware-git] wipv: openoffice.org-3.2.1-5-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=3bb9c71edcd3132db806c75cb7a6368b45e71e57
commit 3bb9c71edcd3132db806c75cb7a6368b45e71e57
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Aug 25 11:08:36 2010 +0200
openoffice.org-3.2.1-5-i686
- add SA40775.diff, closes #4296
- disable broken smp build in non-devel builds
- use openjdk in non-devel builds as well to fix sdk package
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 74d0779..b8c3bcc 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=19
pkgver=$upstream
- pkgrel=4
+ pkgrel=5
snapshot=4-23-ge68b7f9
else
upstream=3.3.0
@@ -40,8 +40,8 @@ groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
up2date=lynx -dump http://download.openoffice.org/source/|grep Source|sed
's/.* \(.*\) .*/\1/;q'
-
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)
- 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
SA40775.diff)
+ signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ''
'' '' '' '' '')
else
unset source signatures
_F_scm_type=git
@@ -155,7 +155,12 @@ build()
if ! Fuse $USE_DEVEL; then
Fextract ooo-build$branch-$snapshot.tar.bz2
Fcd ooo-build$branch-$snapshot
- #cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff
|| Fdie
+
+ # Hotfixes
+ for i in $Fsrcdir/*.diff
+ do
+ ln -sf $i patches/hotfixes/ || Fdie
+ done
# Predownloaded tarballs
for i in $Fsrcdir/$tree-m$milestone-*
@@ -176,10 +181,8 @@ build()
done
fi
- Fpatchall
-
# SMP build
- if [ ! -z $MAKEFLAGS ]; then
+ if Fuse $USE_DEVEL [ ! -z $MAKEFLAGS ]; then
# Comment this out if you think the build failed because of being SMP.
Fconfopts=$Fconfopts --with-max-jobs=${MAKEFLAGS/-j}
unset MAKEFLAGS
@@ -205,7 +208,12 @@ build()
if ! Fuse $USE_DEVEL; then
Fconf --with-lang=ALL --without-git \
-
--with-build-version=openoffice.org-$pkgver-$pkgrel-$CARCH
(ooo-build-${snapshot##*g})
+
--with-build-version=openoffice.org-$pkgver-$pkgrel-$CARCH
(ooo-build-${snapshot##*g}) \
+ --with-jdk-home=/usr/lib/jvm/java-6-openjdk \
+ --with-java-target-version=1.5 \
+ --with-system-lucene \
+ --with-lucene-core-jar=/usr/share/java/lucene-core.jar \
+
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
else
Fconf --with-lang=en-US de es fr hu it pt
fi
diff --git a/source/xapps/openoffice.org/SA40775.diff
b/source/xapps/openoffice.org/SA40775.diff
new file mode 100644
index 000..dbed40a
--- /dev/null
+++ b/source/xapps/openoffice.org/SA40775.diff
@@ -0,0 +1,204 @@
+diff -r 5b1ceed28385 sd/source/filter/ppt/propread.cxx
+--- sd/source/filter/ppt/propread.cxx Fri Aug 06 14:53:07 2010 +0200
sd/source/filter/ppt/propread.cxx Mon Aug 09 14:04:21 2010 +0200
+@@ -29,6 +29,7 @@
+ #include precompiled_sd.hxx
+ #include propread.hxx
+ #include tools/bigint.hxx
++#include tools/debug.hxx
+ #include rtl/tencinfo.h
+ #include rtl/textenc.h
+
+@@ -90,6 +91,17 @@
+
+ //---
+
++static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
++{
++ nSize -= 1; //Drop NULL terminator
++
++ //If it won't fit in a string, clip it to the max size that does
++if (nSize STRING_MAXLEN)
++ nSize = STRING_MAXLEN;
++
++ return nSize;
++}
++
+ BOOL PropItem::Read( String rString, sal_uInt32 nStringType, sal_Bool bAlign
)
+ {
+ sal_uInt32 i, nItemSize, nType, nItemPos;
+@@ -108,36 +120,43 @@
+ {
+ case VT_LPSTR :
+ {
+- if ( (sal_uInt16)nItemSize )
++ if ( nItemSize )
+ {
+- sal_Char* pString = new sal_Char[
(sal_uInt16)nItemSize ];
+- if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
++ try
+ {
+-
[Frugalware-git] wipv: openoffice.org-3.2.1-5-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=566cea02ee0a792fa5e20a5474fc8b7647c8b3ba
commit 566cea02ee0a792fa5e20a5474fc8b7647c8b3ba
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Aug 25 12:47:56 2010 +0200
openoffice.org-3.2.1-5-i686
- typo: always unset MAKEFLAGS
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index b8c3bcc..cc29180 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -182,9 +182,9 @@ build()
fi
# SMP build
- if Fuse $USE_DEVEL [ ! -z $MAKEFLAGS ]; then
+ if [ ! -z $MAKEFLAGS ]; then
# Comment this out if you think the build failed because of being SMP.
- Fconfopts=$Fconfopts --with-max-jobs=${MAKEFLAGS/-j}
+ Fuse $USE_DEVEL Fconfopts=$Fconfopts
--with-max-jobs=${MAKEFLAGS/-j}
unset MAKEFLAGS
fi
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] wipv: openoffice.org-3.2.1-5-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=2bbc14505c85ed71e378831cfb0044e86dd244c6
commit 2bbc14505c85ed71e378831cfb0044e86dd244c6
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat Aug 28 11:57:38 2010 +0200
openoffice.org-3.2.1-5-i686
- USE_DEVEL:
* update to ooo330m4
* add ecj to makedepends as gcc-gcj no longer depends on it
* no longer build any language packs
* always try to build in parallel, then fail back to non-parallel mode
if necessary
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index cc29180..ba157c3 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -16,8 +16,8 @@ else
upstream=3.3.0
branch=
tree=ooo330
- milestone=2
- pkgver=$upstream${tree}_m$milestone.14834.gc2258e4
+ milestone=4
+ pkgver=$upstream${tree}_m$milestone.14973.gcee4ef6
pkgrel=1
fi
pkgdesc=OpenOffice.org, a full office productivity suite.
@@ -31,7 +31,7 @@ depends=('libxml2' 'libart_lgpl' 'libsndfile'
'libgcj-awt=4.4.0-2' 'nas' 'fontc
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
# lucene can be any 2.x version actually
-makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 'gcc-gcj'
'apache-ant' \
+makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 'gcc-gcj' 'ecj'
'apache-ant' \
'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
'patch=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' \
'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \
@@ -70,12 +70,10 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686
x86_64' 'i686 x86_64')
subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra' 'xapps')
subinstall=( $_F_gnome_scriptlet )
-ooodicts=af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi
zu ca he ro
-ooosubpkgs=('de' 'es' 'fr' 'hu' 'it' 'pt')
-ooosubdescs=('German' 'Spanish' 'French' 'Hungarian' 'Italian' 'Portuguese')
if ! Fuse $USE_DEVEL; then
- ooosubpkgs=(${ooosubpk...@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk'
'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt-BR' 'ru' 'rw' 'sh-YU' 'sk'
'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn' 'tr' 'ts' 've'
'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN' 'or-IN'
'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by' 'gd' 'gu'
'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN' 'sat' 'sc'
'sd' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug')
- ooosubdescs=(${ooosubdes...@]} 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Japanese' 'Khmer (Cambodia)' 'Kannada'
'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal'
'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi'
'Punjabi' 'Polish' 'Brazil (Port.)' 'Russian' 'Kinyarwanda' 'Serbian Latin'
'Slovak' 'Slovenian' 'Serbian Cyrillic' 'Swati' 'Sotho' 'Swedish' 'Swahili'
'Swahili ' 'South Georgian' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Venda'
'Vietnamese' 'Xhosa' 'Chinese (simplified)' 'Chinese (traditional)' 'Zulu'
'Persian' 'Kurdish' 'Assamese' 'Malayalam' 'Marathi' 'Oriya' 'Telugu' 'Tajik'
'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha' 'Georgian' 'Kannada' 'Serbo-Croatian'
'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic' 'Gujarati' 'Mongolian'
'Malay' 'Occitan' 'Bodo' 'Dogri' 'Kazakh' 'Konkani' 'Kashmiri' 'Maithili'
'Manipuri' 'Romanian' 'Sanskrit' 'Santali' 'Sardinian' 'Sindhi' 'Tibetan'
'Icelandic' 'Kid' 'Ky' 'Afan Oromo' 'Pap' 'Pashto' 'Sinhala' 'Uyghur')
+ ooodicts=af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv
sw th vi zu ca he ro
+ ooosubpkgs=('de' 'es' 'fr' 'hu' 'it' 'pt' 'af' 'ar' 'be-BY' 'bg' 'bn'
'bn-BD' 'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et'
'eu' 'fi' 'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt'
'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by'
'gd' 'gu' 'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN'
'sat' 'sc' 'sd' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug')
+ ooosubdescs=('German' 'Spanish' 'French' 'Hungarian' 'Italian'
'Portuguese' 'Afrikaans' 'Arabic' 'Belarusian' 'Bulgarian' 'Bengali' 'Bengali
[Frugalware-git] wipv: openoffice.org-3.2.1-5-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=de9172b557454e28cf584c57b6bc6cc7ac907ef2
commit de9172b557454e28cf584c57b6bc6cc7ac907ef2
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat Sep 4 12:25:48 2010 +0200
openoffice.org-3.2.1-5-i686
- USE_DEVEL: update to newer snapshot
- allow fuzzy patches
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index ba157c3..41988a0 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -17,7 +17,7 @@ else
branch=
tree=ooo330
milestone=4
- pkgver=$upstream${tree}_m$milestone.14973.gcee4ef6
+ pkgver=$upstream${tree}_m$milestone.15004.g3ebd5a2
pkgrel=1
fi
pkgdesc=OpenOffice.org, a full office productivity suite.
@@ -188,7 +188,6 @@ build()
# Other options.
Fconfopts=$Fconfopts \
--with-distro=Frugalware \
- --with-tag=$tree-m$milestone \
--with-gcc-speedup=ccache \
--with-openclipart=/usr/share/openclipart \
--with-binsuffix=no \
@@ -217,6 +216,9 @@ build()
./download || return 1
+ # be patch less strict
+ Fsed '--fuzz=0 ' '' patches/apply.pl
+
# on failure make a stab at rebuilding un-parallel
if ! make; then
Fsed ^MAX_JOBS=.* MAX_JOBS='1' bin/setup
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
