[Frugalware-git] frugalware-current: openoffice.org-3.2.1-6-i686

Miklos Vajna vmiklos at frugalware.org
Sat Nov 13 14:33:46 CET 2010


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

commit 55fb2de1489353bd2fa3321e4ea9d25c27e90c4a
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Nov 13 14:30:51 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: update to libreoffice-3.3beta3

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index 920c8e8..eb74fd2 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.2
+		pkgver=3.2.99.3
fi
pkgrel=1
fi
@@ -83,27 +83,27 @@ else
$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')
+			sha1sums=('d6ca6a0d48b2ee035edf9bc00cb8771b93bd4503' \
+          'd6fd9f9152cbbe12fb2f8cc68a2f8022e5c32f3f' \
+          'd55393569d1c53ab8b2f5f17f626544742f57844' \
+          '3dde56c5090493be39bb19fc1f4cd32313e8ccdc' \
+          'c1c7923bd8d4ac3b6f9e4b9514f12a4e8d6070c8' \
+          'a90075ea06c686222a21a68de751b7ca24b9d385' \
+          '01c5b174944750a8b68f3542bfa24c7be2769da7' \
+          'fc286ea9a59c1248893acebe19ef90dd90e144cd' \
+          '919a52c632fb65110c7af5744843cfb1efe55364' \
+          'a6194b851da2568d34d9832f98bd95a0a6657521' \
+          '1f28f7045a47ae2e4d7c1f8e9d0329e63e48ae2d' \
+          '50326944972697f929a5a13c92a1404d24f57e81' \
+          'b217053031ffd960fc28eb4c1970014308d5dae9' \
+          '7df220cc930295dde86ebcab0587c27fffde9b4d' \
+          '5b7cf4ba410db57662bde4b11b3b8f46b98a2db3' \
+          '2081609535803449d9b83bf30a7c16b10e1fc1a9' \
+          '228b5fe6416be3b1a7db688e394217bca5ee192c' \
+          '95fed969893ade82769691760b2155b0cedb3e2e' \
+          '6c136ad9009cd6d362e89d2b590ce69a37d08be7' \
+          'e6ecb9ab3912a2d05a39bf51854e2d4e4cdb614c' \
+          'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d')
fi
fi
NOEXTRACT=1
@@ -280,7 +280,9 @@ build()
if Fuse $USE_GIT; then
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
-			Fconf --without-git
+			# mono-2.8 not yet supported
+			Fconf --without-git --disable-mono
+			# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
fi
fi


More information about the Frugalware-git mailing list