Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f09b642e78b4c4840c72895e0b2bcef234169675
commit f09b642e78b4c4840c72895e0b2bcef234169675
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Tue Oct 12 13:40:53 2010 +0200
openoffice.org-3.2.1-6-i686
- USE_DEVEL: update to 3.2.99.2
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 07a6f50..920c8e8 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -25,7 +25,7 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
- pkgver=3.2.99.1
+ pkgver=3.2.99.2
fi
pkgrel=1
fi
@@ -59,50 +59,51 @@ else
_F_scm_tag=$pkgver
Finclude scm
else
+ mirror="http://download.documentfoundation.org/libreoffice/src/";
_F_archive_name="libreoffice-build"
- up2date="Flasttar http://download.go-oo.org/3.3/";
-
source=(http://download.go-oo.org/3.3/libreoffice-artwork-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-base-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-bootstrap-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-calc-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-components-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-extensions-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-extras-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-filters-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-help-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-impress-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-l10n-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-libs-core-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-libs-extern-sys-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-libs-extern-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-libs-gui-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-postprocess-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-sdk-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-testing-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-ure-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-writer-$pkgver.tar.bz2
-
http://download.go-oo.org/3.3/libreoffice-build-$pkgver.tar.gz)
- sha1sums=('42066401ccea56752bc2701fa5166ee33334775e' \
- 'aa78a8bf0d44681327ec56eb95f47d09bf10d5cd' \
- '0bb33f173f26834a56fc4609be04b561008657cc' \
- '18d1146e0a78e1d8276303b4def00714e3f93e47' \
- 'e9337b40965ca4b835ee4199f0e1f8fe7681c198' \
- '3b84214eafc53ae6b03103e5d9f80251c8c9a401' \
- 'f481166ef05612a95dc2aa588f0f8cb4c9b169d0' \
- 'e52bbed3ba3e0f1466ab4b359d7e9ad65ce23dec' \
- '5a6d891ab3de4af49651c95f527895fb37324cb3' \
- '2b7c4db0bf713d0c7759099678ff48cd8f578a4b' \
- 'da32e11367a2b30f2eb3f25770a75b6b412fa26c' \
- '88c28fdeaa3c989098815bc36d8f5f90d398fd5d' \
- '643237f89370ce59d5378ceff492c69bf0ce1e90' \
- 'd167125c1c40bff757375bb46def61a07d6eea03' \
- '07807d2bda6a056387b171ddf025a7cb7a22d7f3' \
- 'b1a89e95774dd9a2993c218f6f2b893194ff2453' \
- '665040404a7c81a6c7b7c74cc8aa2a1378b29d37' \
- 'd8e25524224aeb78b21fbf098197d7af835d1422' \
- 'ecc3a16c73a62900475a6b2afe306033d2354f9f' \
- '1ca543652935dbec9acc44a0dfe32cadd1ee0343' \
- 'fc295ddc35d27fed5b62870493c32a91ab12cac0')
+ up2date="Flasttar $mirror"
+ source=($mirror/libreoffice-artwork-$pkgver.tar.bz2
+ $mirror/libreoffice-base-$pkgver.tar.bz2
+ $mirror/libreoffice-bootstrap-$pkgver.tar.bz2
+ $mirror/libreoffice-calc-$pkgver.tar.bz2
+ $mirror/libreoffice-components-$pkgver.tar.bz2
+ $mirror/libreoffice-extensions-$pkgver.tar.bz2
+ $mirror/libreoffice-extras-$pkgver.tar.bz2
+ $mirror/libreoffice-filters-$pkgver.tar.bz2
+ $mirror/libreoffice-help-$pkgver.tar.bz2
+ $mirror/libreoffice-impress-$pkgver.tar.bz2
+ $mirror/libreoffice-l10n-$pkgver.tar.bz2
+ $mirror/libreoffice-libs-core-$pkgver.tar.bz2
+ $mirror/libreoffice-libs-extern-sys-$pkgver.tar.bz2
+ $mirror/libreoffice-libs-extern-$pkgver.tar.bz2
+ $mirror/libreoffice-libs-gui-$pkgver.tar.bz2
+ $mirror/libreoffice-postprocess-$pkgver.tar.bz2
+ $mirror/libreoffice-sdk-$pkgver.tar.bz2
+ $mirror/libreoffice-testing-$pkgver.tar.bz2
+ $mirror/libreoffice-ure-$pkgver.tar.bz2
+ $mirror/libreoffice-writer-$pkgver.tar.bz2
+ $mirror/libreoffice-build-$pkgver.tar.gz)
+ sha1sums=('0c1ad7d797b0005b6390633afd53408cf837779a' \
+ '2caf76e0c7ae23d17a39d2bc1824532759d5d738' \
+ '4630ed6f59e386787a2d3d4a3b501ceac36fd63b' \
+ '130a3be5792dcb9cad74694f0fe5800a4d636bc0' \
+ '296bdac7b51ba02c1d27b97005e2a0fb30aec947' \
+ '2c0c0319946faa28f97c95eba5137736d142437c' \
+ 'a4c59568a5c4242041bf3872a1b4faada0011d51' \
+ 'bdc9f54c4a815234d10317b2e6052de746d8de81' \
+ '7be81dee767578e3be77b9a2f85aab50a13a6e0c' \
+ 'af6d71d50ec14f5f75d518c0efe723b781796655' \
+ '1d97e1a4695fe90f1dc8ab3c93f64633e2e73b6a' \
+ 'ff3b326521ffa948ee2afe04632031e0006b0f12' \
+ '15b0131153ed32c00ebf31a52bc7bba818f4513b' \
+ '94741b520a950e376f0b22396fb8f84f26d4dca0' \
+ 'a8a7c7a26e127c9f489082e42153f6ca149a6573' \
+ 'fe3de163959f79a89460c0a5020ba0db4ba0562e' \
+ '05ff1628a1053239311f69eda2c571870ba37261' \
+ 'dafdbd67e55ee9c083eb647e4bcdf24081eab564' \
+ 'b400a35dba41a61ec30fa52831f61a9751613f4e' \
+ '64d83dfcb3a6607be26720a3071cb281fb49e468' \
+ 'af97657aea65fedd51547b81ee26e2bebe9f797f')
fi
fi
NOEXTRACT=1
@@ -280,10 +281,7 @@ build()
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
Fconf --without-git
- # workaround for a stupid autotools bug
- Fsed "'build_alias=$Fbuildchost' " '' bin/setup
- # this one wasn't updated
- Fsed 'ooo-build' 'libreoffice'
download_external_sources.sh
+ sed -i '/fields-table-formula.diff/d'
patches/dev300/apply || return 1
fi
fi
@@ -348,9 +346,8 @@ build()
## Split KDE stuff
Fsplit $pkgname-kde $(grep -v '^%dir' build/kde4_list.txt)
rm build/kde4_list.txt
- # We don't want a kde3 subpackage (but in case it's not empty
- # something is broken, so check for it)
- [ -e build/kde_list.txt -a ! -s build/kde_list.txt ] && rm
build/kde_list.txt
+ # We don't want a kde3 subpackage
+ [ -e build/kde_list.txt ] && rm build/kde_list.txt
## Split GNOME stuff
Fsplit $pkgname-gnome $(grep -v '^%dir' build/gnome_list.txt)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
