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

2011-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b4cbdc0a077c04826381213cc646f1e365928885

commit b4cbdc0a077c04826381213cc646f1e365928885
Author: Miklos Vajna vmik...@frugalware.org
Date:   Wed Jan 5 14:35:46 2011 +0100

openoffice.org-3.2.1-6-i686

- depends: libgcj-awt=4.4.0-2 - openjre
- makedepends: drop pam-headers (pam is in chroot-core) and gcc-gcj
(openjdk is already a makedepend)

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 486aad1..9a38106 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -43,18 +43,17 @@ fi
_F_gnome_desktop=y
Finclude gnome-scriptlet mono kde
unset install
-depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt=4.4.0-2' 'nas' 
'fontconfig' 'libpng=1.4.1' 'imagemagick' \
+depends=('libxml2' 'libart_lgpl' 'libsndfile' 'openjre' 'nas' 'fontconfig' 
'libpng=1.4.1' 'imagemagick' \
'flex' 'neon=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 
'perl-archive-zip' \
'unixodbc' 'libxaw=1.0.5' 'libxslt' 'startup-notification=0.9-3' 
'libwpd=0.8.13' 'poppler' 'libboost-mt' \
'sane-backends' 'lp_solve' 'silgraphite' 'libtextcat')
# 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' 'ecj' 
'apache-ant' \
+makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'ecj' 'apache-ant' \
'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
'patch=2.5.9' 'openclipart' 'xorg-server' 'gstreamer=0.10.30-2' 
'gst-plugins-base' \
'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \
-'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.4' 'cppunit' 
'hsqldb' 'bsh' 'vigra' \
+'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene' 'cppunit' 'hsqldb' 
'bsh' 'vigra' \
'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2011-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6530cb3e7a21a0bf04ae85f88d8620634b814705

commit 6530cb3e7a21a0bf04ae85f88d8620634b814705
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Jan 14 16:26:04 2011 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
- up to libreoffice 3.3rc3
- use signatures() instead of sha1sums()
- disable system-mdds, mdds-0.5 is not yet supported
- handle parallel make install errors

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 9a38106..02b980d 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -29,7 +29,7 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
-   pkgver=3.3.0.2
+   pkgver=3.3.0.3
fi
pkgrel=1
fi
@@ -75,73 +75,38 @@ else
mirror=http://download.documentfoundation.org/libreoffice/src/;
_F_archive_name=libreoffice-build
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 \
-   
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+   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)
+   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
-   sha1sums=('ff837dbc5ac4d8431e4041ba6d58832005cae074' \
-  'ac81bc4d8621ad2a74c6318fb4226d994d02d13f' \
-  '9ac24e7908a34a5fe640fc7f7e049d6db23a2f5f' \
-  '37ee6b4e7fcbf841829501bbcab613fad739f2ee' \
-  'aaa2bbe5f5d088e209c31573a5dd5db4ce0369e7' \
-  '3642fc3dc39f3421241f0f29cc4a0fdc028329b4' \
-  'a00d41c752d82e56fe57616b812ef45dd56b9617' \
-  '09ab1f9e1afac6819961dff33480171672213c62' \
-  'a36c57ec6e5ce9c4eb9c252f52168a4fe8bd4887' \
-  '6c4febd38622eab7ae031607abbd33b4b2dacd42' \
-  '072c3c843a59b79a3a3c9ab7f0f531eb3fc1d999' \
-  'e894917e50f47b4acb4db98850c64f9fb3948073' \
-  '40e2bb092318b07a04b74f85578ff4305edf909d' \
-

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

2011-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6552dfe4e726188cf329710928d456b66c7b2d0d

commit 6552dfe4e726188cf329710928d456b66c7b2d0d
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat Jan 15 01:17:00 2011 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: fix desktop files after the oowriter - lowriter, etc
renames

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 02b980d..d4ba4da 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -332,6 +332,16 @@ build()
# 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
+
+   # Fix desktop files
+   for i in $Fdestdir/usr/share/applications/*.desktop
+   do
+   file=$(basename $i)
+   # if there is a better version in the xdg dir, use it
+   if [ -e $Fdestdir/usr/lib/libreoffice/share/xdg/$file 
]; then
+   Fln /usr/lib/libreoffice/share/xdg/$file 
/usr/share/applications/$file
+   fi
+   done
fi

# Permission fixes
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2011-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=eb7954892a64d32908efbf3f1a3a8eef9b9191e2

commit eb7954892a64d32908efbf3f1a3a8eef9b9191e2
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Jan 16 00:25:29 2011 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
- fix progressbar location on splash
- fix icon in dektop files

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index d4ba4da..b43bac3 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -332,16 +332,23 @@ build()
# 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
+   Fsed 'ProgressPosition=164,225' 'ProgressPosition=116,195' 
$Fdestdir/usr/lib/libreoffice/program/sofficerc

-   # Fix desktop files
+   # Use desktop files from sysui, those have correct
+   # lowriter instead of non-existing oowriter, etc.
for i in $Fdestdir/usr/share/applications/*.desktop
do
file=$(basename $i)
-   # if there is a better version in the xdg dir, use it
if [ -e $Fdestdir/usr/lib/libreoffice/share/xdg/$file ]; then
Fln /usr/lib/libreoffice/share/xdg/$file /usr/share/applications/$file
fi
done
+   # Use libreoffice-gulls instead of non-existing 
libreoffice-startcenter icon
+   Fsed 'libreoffice-startcenter' 'libreoffice-gulls' 
$Fdestdir/usr/lib/libreoffice/share/xdg/startcenter.desktop
+   for i in $Fdestdir/usr/share/pixmaps/ooo-*
+   do
+   mv $i $(echo $i|sed 's/ooo/libreoffice/') || return 1
+   done
fi

# Permission fixes
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2011-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7573ca090ad5b6e10bd7c4a42aec7ec6df466005

commit 7573ca090ad5b6e10bd7c4a42aec7ec6df466005
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Jan 21 14:27:25 2011 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: update to 3.3rc4
- use Fmakeinstall again now that its recent breakage got fixed

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index b43bac3..810f997 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -29,7 +29,7 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
-   pkgver=3.3.0.3
+   pkgver=3.3.0.4
fi
pkgrel=1
fi
@@ -322,11 +322,7 @@ build()
make || return 1
fi

-   # same for make install
-   if ! make DESTDIR=$Fdestdir install; then
-   Fsed ^MAX_JOBS=.* MAX_JOBS='1' bin/setup
-   make DESTDIR=$Fdestdir install || return 1
-   fi
+   Fmakeinstall

if Fuse $USE_DEVEL; then
# Install artwork
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git