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

Miklos Vajna vmiklos at frugalware.org
Sun Nov 21 14:34:05 CET 2010


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

commit 245061ea7a6e82d52f708f1481ea2b1bf844aee9
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Nov 21 14:29:27 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:

* fix splash screen
* backport config update patch from git + clean up configure switches

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index 15e3527..c5ae398 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -31,7 +31,7 @@ else
else
pkgver=3.2.99.3
fi
-	pkgrel=2
+	pkgrel=3
fi
if ! Fuse $USE_DEVEL; then
pkgdesc="OpenOffice.org, a full office productivity suite."
@@ -97,7 +97,10 @@ else
$mirror/libreoffice-ure-$pkgver.tar.bz2
$mirror/libreoffice-writer-$pkgver.tar.bz2
$mirror/libreoffice-build-$pkgver.tar.gz \
-			http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+			http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll \
+			system.patch \
+			http://ftp.frugalware.org/pub/other/people/devil505/artwork/libreoffice/intro.png \
+			http://ftp.frugalware.org/pub/other/people/devil505/artwork/libreoffice/about.png)
ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
@@ -130,6 +133,9 @@ else
'e6ecb9ab3912a2d05a39bf51854e2d4e4cdb614c' \
'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d' \
'712720da502d36175cd7aa05cb1862ee0330638c' \
+          'c85576df365214eedbd17b87588ea1043469b93d' \
+          'bb06b44f9e3a35a191bbef53887d1bf87e4d2447' \
+          'cfc01f66c8e5733e11830d03f229d2676611bdc3' \
'1dcd28d3fc7af42ceb63006cdc56aa55ac66d355' \
'6e836945719e137596df1ca82f0afa809e8a2e88' \
'528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba' \
@@ -269,6 +275,7 @@ build()
else
Fextract libreoffice-build-$pkgver.tar.gz
Fcd libreoffice-build-$pkgver
+			Fpatch system.patch
for i in $Fsrcdir/libreoffice-*
do
ln -sf $i src/
@@ -321,12 +328,7 @@ build()
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
# mono-2.8 not yet supported
-			Fconf --without-git --disable-mono \
-				--with-additional-sections="UnstableLibwpd" \
-				--with-system-libs --with-system-headers --without-system-saxon \
-				--with-external-tar=`pwd`/ext_source \
-				--without-afms --with-system-libtextcat --with-system-libtextcat-data \
-				--with-system-dicts --with-external-dict-dir=/usr/share/myspell --without-myspell-dicts
+			Fconf --without-git --disable-mono --with-additional-sections="UnstableLibwpd"
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
# don't download external sources
@@ -337,6 +339,8 @@ build()
ln -sf $Fsrcdir/$i ext_source/
done
ln -sf $Fsrcdir/unowinreg.dll ext_source/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+			ln -sf $Fsrcdir/intro.png src/openintro_fw.png
+			ln -sf $Fsrcdir/about.png src/openabout_fw.png
fi
fi

@@ -353,6 +357,12 @@ build()

Fmakeinstall

+	if Fuse $USE_DEVEL; then
+		# Install artwork
+		cat src/openintro_fw.png > $Fdestdir/usr/lib/$pkgname/program/intro.png
+		cat src/openabout_fw.png > $Fdestdir/usr/lib/$pkgname/program/about.png
+	fi
+
# Permission fixes
find $Fdestdir/usr/lib/$pkgname/program -name "*.so" ! -perm 755 -exec chmod 755 {} \;

diff --git a/source/xapps/openoffice.org/system.patch b/source/xapps/openoffice.org/system.patch
new file mode 100644
index 0000000..89ba6d1
--- /dev/null
+++ b/source/xapps/openoffice.org/system.patch
@@ -0,0 +1,52 @@
+diff --git a/distro-configs/Frugalware.conf.in b/distro-configs/Frugalware.conf.in
+index adfccbf..876127a 100644
+--- a/distro-configs/Frugalware.conf.in
++++ b/distro-configs/Frugalware.conf.in
+@@ -1,26 +1,10 @@
+---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_fw.bmp\"
+---with-about-bitmaps=\"$TOOLSDIR/src/openabout_fw.bmp\"
+ --with-vendor=\"Frugalware Linux\"
+---with-system-curl
+---with-system-expat
+---with-system-neon
+---with-system-sndfile
+---with-system-boost
+---with-system-hunspell
+---with-system-odbc-headers
+---with-system-nas
+---with-system-freetype
+ --with-jdk-home=$JAVA_HOME
+ --with-java-target-version=1.5
+---with-system-xalan
+---with-system-xerces
+---with-system-xml-apis
+---with-system-lucene
+ --with-serializer-jar=/usr/share/java/serializer.jar
+ --with-xalan-jar=/usr/share/java/xalan.jar
+ --with-xerces-jar=/usr/share/java/xercesImpl.jar
+ --with-xml-apis-jar=/usr/share/java/xml-apis.jar
+---with-lucene-core-jar=/usr/share/java/lucene-core.jar
+ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
+ --disable-kde
+ --enable-kde4
+@@ -31,10 +15,15 @@
+ --disable-rpath
+ --disable-qadevooo
+ --enable-gcjaot
+---with-system-libxslt
+---with-system-libwpd
+ --without-fonts
+ --with-system-mozilla=mozilla
+---with-external-dict-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries
+---with-external-hyph-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries
+---with-external-thes-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries
++--with-system-libs
++--with-system-headers
++--without-system-saxon
++--with-external-tar=\"$TOOLSDIR/ext_source\"
++--without-afms
++--with-system-libtextcat
++--with-system-libtextcat-data
++--with-system-dicts
++--with-external-dict-dir=/usr/share/myspell
++--without-myspell-dicts


More information about the Frugalware-git mailing list