[Frugalware-git] xfcetesting: libreoffice-3.3.1.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=add4bb3cb1c5e1bfcd10ce85956086735fd4b125
commit add4bb3cb1c5e1bfcd10ce85956086735fd4b125
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Feb 23 12:50:03 2011 +0100
libreoffice-3.3.1.2-1-i686
- bump to 3.3.1 final
- clean up no longer used USE_GIT
diff --git a/source/xapps/libreoffice/FrugalBuild
b/source/xapps/libreoffice/FrugalBuild
index fefea30..8383112 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -4,25 +4,15 @@
# build released development version
USE_DEVEL=${USE_DEVEL:-n}
-# build directly from git
-USE_GIT=${USE_GIT:-n}
pkgname=libreoffice
-if Fuse $USE_GIT; then
- upstream=3.3.0
- tree=ooo330
- milestone=7
- pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
+if ! Fuse $USE_DEVEL; then
+ pkgver=3.3.1.2
pkgrel=1
else
- if ! Fuse $USE_DEVEL; then
- pkgver=3.3.0.4
- pkgrel=3
- else
- pkgver=3.3.1.2
- pkgrel=1
- fi
+ pkgver=3.3.1.2
+ pkgrel=1
fi
pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org.
url=http://www.documentfoundation.org/download/;
@@ -44,49 +34,41 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'ecj'
'apache-ant' \
groups=('xapps')
archs=('i686' 'x86_64')
replaces=('openoffice.org')
-if Fuse $USE_GIT; then
- unset source signatures
- _F_scm_type=git
- _F_scm_url=git://anongit.freedesktop.org/git/libreoffice/build
- _F_scm_tag=$pkgver
- Finclude scm
-else
- mirror=http://download.documentfoundation.org/libreoffice/src/;
- _F_archive_name=libreoffice-build
- up2date=Flasttar $mirror
- modules=('artwork' 'base' 'bootstrap' 'calc'
- 'components' 'extensions' 'extras' 'filters' 'help'
- 'impress' 'l10n' 'libs-core' 'libs-extern-sys'
- 'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
- 'ure' 'writer' 'build')
- source=()
- for i in ${modules[@]}
- do
- [ $i == build ] ext=gz || ext=bz2
- source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext)
- signatures=(${signatures[@]}
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
- done
- source=(${source[@]}
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+mirror=http://download.documentfoundation.org/libreoffice/src/;
+_F_archive_name=libreoffice-build
+up2date=Flasttar $mirror
+modules=('artwork' 'base' 'bootstrap' 'calc'
+ 'components' 'extensions' 'extras' 'filters' 'help'
+ 'impress' 'l10n' 'libs-core' 'libs-extern-sys'
+ 'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
+ 'ure' 'writer' 'build')
+source=()
+for i in ${modules[@]}
+do
+ [ $i == build ] ext=gz || ext=bz2
+ source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext)
+ signatures=(${signatures[@]}
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
+done
+source=(${source[@]}
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+signatures=(${signatures[@]} '')
+ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
+ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
+ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
+ 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
+ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
+ cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
+for i in ${ext_source[@]}
+do
+ source=(${source[@]} http://hg.services.openoffice.org/binaries/$i)
signatures=(${signatures[@]} '')
- ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
- fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
- ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
- 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
- cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
- for i in ${ext_source[@]}
- do
- source=(${source[@]}
http://hg.services.openoffice.org/binaries/$i)
- signatures=(${signatures[@]} '')
- done
- go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
- for i in ${go_oo_source[@]}
- do
- source=(${source[@]} http://download.go-oo.org/SRC680/$i)
- signatures=(${signatures[@]} '')
- done
-fi
+done
+go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
+for i in ${go_oo_source[@]}
+do
+ source=(${source[@]} http://download.go-oo.org/SRC680/$i)
+ signatures=(${signatures[@]} '')
+done
NOEXTRACT=1
options=(${options[@]} 'scriptlet')
@@ -168,17 +150,12 @@ done
build()
{
Fmonoexport
-
[Frugalware-git] xfcetesting: libreoffice-3.3.1.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ae32df5b4975e5f896b91dd4d005c886aac1a024
commit ae32df5b4975e5f896b91dd4d005c886aac1a024
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Mar 9 00:36:24 2011 +0100
libreoffice-3.3.1.2-1-i686
- drop unused patch
diff --git a/source/xapps/libreoffice/SA40775.diff
b/source/xapps/libreoffice/SA40775.diff
deleted file mode 100644
index dbed40a..000
--- a/source/xapps/libreoffice/SA40775.diff
+++ /dev/null
@@ -1,204 +0,0 @@
-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
- {
-- nItemSize = 1;
-- if ( (sal_uInt16)nItemSize 1 )
-+ sal_Char* pString = new sal_Char[
nItemSize ];
-+ if ( mnTextEnc == RTL_TEXTENCODING_UCS2
)
- {
-- sal_Unicode* pWString =
(sal_Unicode*)pString;
-- for ( i = 0; i
(sal_uInt16)nItemSize; i++ )
-- *this pWString[ i ];
-- rString = String( pWString,
(sal_uInt16)nItemSize - 1 );
-- }
-- else
-- rString = String();
-- bRetValue = sal_True;
-- }
-- else
-- {
-- SvMemoryStream::Read( pString,
(sal_uInt16)nItemSize );
-- if ( pString[ (sal_uInt16)nItemSize - 1
] == 0 )
-- {
-- if ( (sal_uInt16)nItemSize 1 )
-- rString = String(
ByteString( pString ), mnTextEnc );
-+ nItemSize = 1;
-+ if ( nItemSize 1 )
-+ {
-+ sal_Unicode* pWString =
(sal_Unicode*)pString;
-+ for ( i = 0; i
nItemSize; i++ )
-+ *this
pWString[ i ];
-+ rString = String(
pWString, lcl_getMaxSafeStrLen(nItemSize) );
-+ }
- else
- rString = String();
- bRetValue = sal_True;
- }
-+ else
-+ {
-+ SvMemoryStream::Read( pString,
nItemSize );
-+ if ( pString[ nItemSize - 1 ]
== 0 )
-+ {
-+ if ( nItemSize 1 )
-+ rString =
String( ByteString( pString ), mnTextEnc );
-+ else
-+ rString =
String();
-+ bRetValue = sal_True;
-+ }
-+
[Frugalware-git] xfcetesting: libreoffice-3.3.1.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=129e5f2763fc799f340843c874d80d385a047b09
commit 129e5f2763fc799f340843c874d80d385a047b09
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat Mar 12 01:08:54 2011 +0100
libreoffice-3.3.1.2-1-i686
- USE_DEVEL: 3.3.2rc1
- drop no longer necessary replaces
diff --git a/source/xapps/libreoffice/FrugalBuild
b/source/xapps/libreoffice/FrugalBuild
index 0ad63a9..b989eb6 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -11,7 +11,7 @@ if ! Fuse $USE_DEVEL; then
pkgver=3.3.1.2
pkgrel=1
else
- pkgver=3.3.1.2
+ pkgver=3.3.2.1
pkgrel=1
fi
pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org.
@@ -33,7 +33,7 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'ecj'
'apache-ant' \
'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
-replaces=('openoffice.org' 'ooextras')
+replaces=('ooextras')
mirror=http://download.documentfoundation.org/libreoffice/src/;
_F_archive_name=libreoffice-build
up2date=Flasttar $mirror
@@ -89,7 +89,6 @@ subrodepends=($pkgname=$pkgver \
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 )
-subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 'openoffice.org-sdk'
'openoffice.org-mono' 'openoffice.org-mozilla')
# sed ':a;N;$!ba;s/\\\n//g' solenv/inc/postset.mk|grep ^completelangiso=|sed
's/completelangiso=//;s/en-US //'
completelangiso=(af ar as ast be-BY bo bg br brx bn bs ca ca-XV cs cy da
@@ -126,20 +125,7 @@ while [ $i -lt ${#completelangiso[@]} ]
do
subpkgs=(${subpkgs[@]} $pkgname-l10n-`echo ${completelangiso[$i]}|tr [A-Z]
[a-z]`)
subdescs=(${subdescs[@]} Installs ${completelangdescs[$i]} support in
LibreOffice)
- subreplaces=(${subreplaces[@]} openoffice.org-i18n-`echo
${completelangiso[$i]}|tr [A-Z] [a-z]`)
- i=$(($i+1))
-done
-
-i=0
-while [ $i -lt ${#completelangiso[@]} ]
-do
subinstall=(${subinstall[@]} '')
- i=$(($i+1))
-done
-
-i=0
-while [ $i -lt ${#completelangiso[@]} ]
-do
subdepends=(${subdepends[@]} )
subrodepends=(${subrodepends[@]} $pkgname=$pkgver)
subgroups=(${subgroups[@]} locale-extra)
@@ -167,6 +153,7 @@ build()
# FIXME --with-openclipart=/usr/share/openclipart does not fail,
# but slows down the build at the moment and in the end it does
# not do anything, so disable it for now.
+ # mono-2.8 and mdds-0.5 are not yet supported
Fconfopts=$Fconfopts \
--with-distro=Frugalware \
--with-gcc-speedup=ccache \
@@ -177,13 +164,13 @@ build()
--with-system-libwps \
--with-system-libwpg \
--with-system-mdbtools \
- --with-system-mdds
+ --without-system-mdds \
+ --disable-mono
# Optimize build.
export ARCH_FLAGS=$CFLAGS
- # mono-2.8 and mdds-0.5 are not yet supported
- Fconf --with-lang=en-US ${completelangiso[*]} --disable-mono
--without-system-mdds
+ Fconf --with-lang=en-US ${completelangiso[*]}
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
mkdir -p src
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] xfcetesting: libreoffice-3.3.1.2-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b5a50df8eb7207b90eab25585bd93f87d11b3493 commit b5a50df8eb7207b90eab25585bd93f87d11b3493 Author: Miklos Vajna vmik...@frugalware.org Date: Fri Mar 18 18:34:29 2011 +0100 libreoffice-3.3.1.2-1-i686 - USE_DEVEL: 3.3.2rc2 diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index b989eb6..be2c0e5 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -11,7 +11,7 @@ if ! Fuse $USE_DEVEL; then pkgver=3.3.1.2 pkgrel=1 else - pkgver=3.3.2.1 + pkgver=3.3.2.2 pkgrel=1 fi pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org. ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
