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

2011-01-21 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.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

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

2011-01-15 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.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] frugalware-current: openoffice.org-3.2.1-6-i686

2011-01-14 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.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] frugalware-current: openoffice.org-3.2.1-6-i686

2011-01-14 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.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] frugalware-current: openoffice.org-3.2.1-6-i686

2011-01-05 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.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] frugalware-current: openoffice.org-3.2.1-6-i686

2010-12-23 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fbc8a2930ea5de546f93052470535858e38ee8f

commit 9fbc8a2930ea5de546f93052470535858e38ee8f
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Dec 23 11:46:28 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: bump to 3.3rc2

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 5770a7c..d5dbc39 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.1
+   pkgver=3.3.0.2
fi
pkgrel=1
fi
@@ -108,27 +108,27 @@ else
do
source=(${sour...@]} http://hg.services.openoffice.org/binaries/$i)
done
-   sha1sums=('17a8ea25843e332b3ac9830880464ae97bb6e225' \
-  'b952e60ecf19da0f04821e6c3c9d6c55b0b84b9f' \
-  '8810c7d1d71548c71b781b906d0490129b3dec77' \
-  '33538ec7a98bc17c0656e0bca33589e1ebcbc691' \
-  'c7b8b1f121a70b00695df6b59398d8f00e56ea4f' \
-  '84474bd003f99d7b5d518d93859762797d62918c' \
-  '9aa06d57803edce32ce049e43c239813e6d994fe' \
-  '72029dad604ea02050b014b1862242ae6715fa7e' \
-  '8aa843f739a9860875b1212303a661b6af75850f' \
-  '037088c18f1024435317346a8c44b6d19fdcaccc' \
-  'a7cd1a419af2987ce6ed074498fbd5586c6ece88' \
-  '914f509e999cf34763958ddff6542034cdcea843' \
-  'b5167a5c450435e35617ad498088fb6d88f951d0' \
-  '8c09ddb409a9f4babc9b67c0f757ed736818d2c8' \
-  'c2a2667dedd0b34796065288e8353a1a142b960f' \
-  '502cbacacea12b80f03b3855f6324050573368a7' \
-  '125a4e97f0dc9e2defb66ee8936b65ce69148783' \
-  '87d2a5122aabcd751c878b23b8f55398116b97c7' \
-  'b791ce01aae1131e6c63eaefeb42519a6fc1e3c5' \
-  '143f9ad1cd43510764531a7fb160973858ac53a5' \
-  '3386a3838b7959b57f2cb62603a16c17d5d69312' \
+   sha1sums=('ff837dbc5ac4d8431e4041ba6d58832005cae074' \
+  'ac81bc4d8621ad2a74c6318fb4226d994d02d13f' \
+  '9ac24e7908a34a5fe640fc7f7e049d6db23a2f5f' \
+  '37ee6b4e7fcbf841829501bbcab613fad739f2ee' \
+  'aaa2bbe5f5d088e209c31573a5dd5db4ce0369e7' \
+  '3642fc3dc39f3421241f0f29cc4a0fdc028329b4' \
+  'a00d41c752d82e56fe57616b812ef45dd56b9617' \
+  '09ab1f9e1afac6819961dff33480171672213c62' \
+  'a36c57ec6e5ce9c4eb9c252f52168a4fe8bd4887' \
+  '6c4febd38622eab7ae031607abbd33b4b2dacd42' \
+  '072c3c843a59b79a3a3c9ab7f0f531eb3fc1d999' \
+  'e894917e50f47b4acb4db98850c64f9fb3948073' \
+  '40e2bb092318b07a04b74f85578ff4305edf909d' \
+  '95d9076b9a8d1b48b0b07dbaf4dd928998386f9a' \
+  '58e0f159e45300aafe5a91c2ca34831431449a4c' \
+  '6e078c211d66f797552fcf565fd61d03c7ec7e62' \
+  '4d094cf5765d36b917911600b433f16b76a68932' \
+  'cb32ee5d48e39a97ca4085f2b411c733202ee12f' \
+  'a54885c0363a229100ad9876852126d6353d6815' \
+  'e8fda650937e2f4b39f4dcedfadd807f81ca6688' \
+  '49bb9d14ce84ae15a7782e81c7185d8f55efd8f2' \
'712720da502d36175cd7aa05cb1862ee0330638c' \
'1dcd28d3fc7af42ceb63006cdc56aa55ac66d355' \
'6e836945719e137596df1ca82f0afa809e8a2e88' \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-12-23 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a3176d0bd7dc97658785d91b4b02623a0fb9a0a

commit 8a3176d0bd7dc97658785d91b4b02623a0fb9a0a
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Dec 23 22:20:05 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: switch to fully offline build

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index d5dbc39..486aad1 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -108,6 +108,11 @@ else
do
source=(${sour...@]} http://hg.services.openoffice.org/binaries/$i)
done
+   go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
+   for i in ${go_oo_sour...@]}
+   do
+   source=(${sour...@]} 
http://download.go-oo.org/SRC680/$i)
+   done
sha1sums=('ff837dbc5ac4d8431e4041ba6d58832005cae074' \
'ac81bc4d8621ad2a74c6318fb4226d994d02d13f' \
'9ac24e7908a34a5fe640fc7f7e049d6db23a2f5f' \
@@ -135,7 +140,9 @@ else
'528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba' \
'8f949ae74a6d66278a595bd063f13e0ad196d14a' \
'8a90669029e107b61953b90ba11545fef586c2ca' \
-  '1acea86fd399ed7817879d36370d3d1f8b109050')
+  '1acea86fd399ed7817879d36370d3d1f8b109050' \
+  'c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6' \
+  '5a12014afa75ecb51b9688497450115d64f1c167')
fi
fi
NOEXTRACT=1
@@ -324,8 +331,11 @@ build()
Fconf --disable-mono
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-   # don't download external sources
-   sed -i '/download_external_sources();/d' download || 
return 1
+   mkdir -p src
+   for i in ${go_oo_sour...@]}
+   do
+   ln -sf $Fsrcdir/$i src/
+   done
mkdir -p ext_source
for i in ${ext_sour...@]}
do
@@ -335,7 +345,9 @@ build()
fi
fi

-   ./download || return 1
+   if ! Fuse $USE_DEVEL; then
+   ./download || return 1
+   fi

# make patch be less strict
Fsed '--fuzz=0 ' '' patches/apply.pl
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f62cad2ae63fcd3ca1c302b023d9916f8a5320d

commit 5f62cad2ae63fcd3ca1c302b023d9916f8a5320d
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Dec 6 13:08:27 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
- bump to 3.3rc1
- drop git backport patches
- drop libwpd hack, newer libwpd is now supported out of the box

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index c5ae398..5770a7c 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -29,9 +29,9 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
-   pkgver=3.2.99.3
+   pkgver=3.3.0.1
fi
-   pkgrel=3
+   pkgrel=1
fi
if ! Fuse $USE_DEVEL; then
pkgdesc=OpenOffice.org, a full office productivity suite.
@@ -54,7 +54,7 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 
'gcc-gcj' 'ecj' 'a
'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.3' 'cppunit' 
'hsqldb' 'bsh' 'vigra' \
+'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.4' 'cppunit' 
'hsqldb' 'bsh' 'vigra' \
'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
@@ -97,10 +97,7 @@ 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 \
-   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)
+   
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
@@ -111,31 +108,28 @@ else
do
source=(${sour...@]} http://hg.services.openoffice.org/binaries/$i)
done
-   sha1sums=('d6ca6a0d48b2ee035edf9bc00cb8771b93bd4503' \
-  'd6fd9f9152cbbe12fb2f8cc68a2f8022e5c32f3f' \
-  'd55393569d1c53ab8b2f5f17f626544742f57844' \
-  '3dde56c5090493be39bb19fc1f4cd32313e8ccdc' \
-  'c1c7923bd8d4ac3b6f9e4b9514f12a4e8d6070c8' \
-  'a90075ea06c686222a21a68de751b7ca24b9d385' \
-  '01c5b174944750a8b68f3542bfa24c7be2769da7' \
-  'fc286ea9a59c1248893acebe19ef90dd90e144cd' \
-  '919a52c632fb65110c7af5744843cfb1efe55364' \
-  'a6194b851da2568d34d9832f98bd95a0a6657521' \
-  '1f28f7045a47ae2e4d7c1f8e9d0329e63e48ae2d' \
-  '50326944972697f929a5a13c92a1404d24f57e81' \
-  'b217053031ffd960fc28eb4c1970014308d5dae9' \
-  '7df220cc930295dde86ebcab0587c27fffde9b4d' \
-  '5b7cf4ba410db57662bde4b11b3b8f46b98a2db3' \
-  '2081609535803449d9b83bf30a7c16b10e1fc1a9' \
-  '228b5fe6416be3b1a7db688e394217bca5ee192c' \
-  '95fed969893ade82769691760b2155b0cedb3e2e' \
-  '6c136ad9009cd6d362e89d2b590ce69a37d08be7' \
-  'e6ecb9ab3912a2d05a39bf51854e2d4e4cdb614c' \
-  'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d' \
+   sha1sums=('17a8ea25843e332b3ac9830880464ae97bb6e225' \
+  'b952e60ecf19da0f04821e6c3c9d6c55b0b84b9f' \
+  '8810c7d1d71548c71b781b906d0490129b3dec77' \
+  '33538ec7a98bc17c0656e0bca33589e1ebcbc691' \
+  'c7b8b1f121a70b00695df6b59398d8f00e56ea4f' \
+  '84474bd003f99d7b5d518d93859762797d62918c' \
+  '9aa06d57803edce32ce049e43c239813e6d994fe' \
+  '72029dad604ea02050b014b1862242ae6715fa7e' \
+  '8aa843f739a9860875b1212303a661b6af75850f' \
+  '037088c18f1024435317346a8c44b6d19fdcaccc' \
+  'a7cd1a419af2987ce6ed074498fbd5586c6ece88' \
+  '914f509e999cf34763958ddff6542034cdcea843' \
+  'b5167a5c450435e35617ad498088fb6d88f951d0' \
+  '8c09ddb409a9f4babc9b67c0f757ed736818d2c8' \
+  'c2a2667dedd0b34796065288e8353a1a142b960f' \
+  '502cbacacea12b80f03b3855f6324050573368a7' \
+  '125a4e97f0dc9e2defb66ee8936b65ce69148783' \
+  '87d2a5122aabcd751c878b23b8f55398116b97c7' \
+  'b791ce01aae1131e6c63eaefeb42519a6fc1e3c5' \
+  '143f9ad1cd43510764531a7fb160973858ac53a5' \
+  '3386a3838b7959b57f2cb62603a16c17d5d69312' \
'712720da502d36175cd7aa05cb1862ee0330638c' \
-  'c85576df365214eedbd17b87588ea1043469b93d' \
-  'bb06b44f9e3a35a191bbef53887d1bf87e4d2447' \
-  'cfc01f66c8e5733e11830d03f229d2676611bdc3' \

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

2010-11-21 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=245061ea7a6e82d52f708f1481ea2b1bf844aee9

commit 245061ea7a6e82d52f708f1481ea2b1bf844aee9
Author: Miklos Vajna vmik...@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 000..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

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

2010-11-20 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa8a210a9b7a76dd2155b5a7db64da7bfbe33d21

commit aa8a210a9b7a76dd2155b5a7db64da7bfbe33d21
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat Nov 20 15:08:53 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:

* use --with-system-libs and --with-system-headers, reducing
the (compressed!) package size from 98M to 88M

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 577f5c8..354678b 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=1
+   pkgrel=2
fi
if ! Fuse $USE_DEVEL; then
pkgdesc=OpenOffice.org, a full office productivity suite.
@@ -45,7 +45,8 @@ 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' \
'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')
+'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
@@ -53,7 +54,8 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 
'gcc-gcj' 'ecj' 'a
'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.3')
+'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.3' 'cppunit' 
'hsqldb' 'bsh' 'vigra' \
+'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
if Fuse $USE_DEVEL; then
@@ -94,8 +96,19 @@ else
$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=('d6ca6a0d48b2ee035edf9bc00cb8771b93bd4503' \
+   $mirror/libreoffice-build-$pkgver.tar.gz \
+   
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+   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)
+   for i in ${ext_sour...@]}
+   do
+   source=(${sour...@]} 
http://hg.services.openoffice.org/binaries/$i)
+   done
+   sha1sums=('d6ca6a0d48b2ee035edf9bc00cb8771b93bd4503' \
'd6fd9f9152cbbe12fb2f8cc68a2f8022e5c32f3f' \
'd55393569d1c53ab8b2f5f17f626544742f57844' \
'3dde56c5090493be39bb19fc1f4cd32313e8ccdc' \
@@ -301,9 +314,23 @@ build()
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
# mono-2.8 not yet supported
-   Fconf --without-git --disable-mono
+   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-mythes \
+   --with-system-dicts 
--with-external-dict-dir=/usr/share/myspell --without-myspell-dicts
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
+   # don't download external sources
+   sed -i '/download_external_sources();/d' download || 
return 1
+   mkdir -p ext_source
+   for i in ${ext_sour...@]}
+   do
+   ln -sf $Fsrcdir/$i ext_source/
+   done
+   ln -sf $Fsrcdir/unowinreg.dll 
ext_source/185d60944ea767075d27247c3162b3bc-unowinreg.dll
fi
fi
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-11-20 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=521d2dd4a5103e60fa3dd17c6ca3cfca1126918e

commit 521d2dd4a5103e60fa3dd17c6ca3cfca1126918e
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat Nov 20 15:13:38 2010 +0100

openoffice.org-3.2.1-6-i686

- forgot to update sha1sums()

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 354678b..c26624e 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -128,7 +128,14 @@ else
'95fed969893ade82769691760b2155b0cedb3e2e' \
'6c136ad9009cd6d362e89d2b590ce69a37d08be7' \
'e6ecb9ab3912a2d05a39bf51854e2d4e4cdb614c' \
-  'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d')
+  'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d' \
+  '712720da502d36175cd7aa05cb1862ee0330638c' \
+  '1dcd28d3fc7af42ceb63006cdc56aa55ac66d355' \
+  '6e836945719e137596df1ca82f0afa809e8a2e88' \
+  '528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba' \
+  '8f949ae74a6d66278a595bd063f13e0ad196d14a' \
+  '8a90669029e107b61953b90ba11545fef586c2ca' \
+  '1acea86fd399ed7817879d36370d3d1f8b109050')
fi
fi
NOEXTRACT=1
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-11-20 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36dc3548729ba4048ad509f9a9f21e97ffb2dd55

commit 36dc3548729ba4048ad509f9a9f21e97ffb2dd55
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Nov 21 03:20:32 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: remove --with-system-mythes, it's already the default

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index c26624e..15e3527 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -326,7 +326,6 @@ build()
--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-mythes \
--with-system-dicts --with-external-dict-dir=/usr/share/myspell 
--without-myspell-dicts
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-11-14 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ae9b60cece1144e30597c8edf510423240c9df8

commit 3ae9b60cece1144e30597c8edf510423240c9df8
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat Nov 13 18:15:55 2010 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL: rename package to libreoffice (+ all subpackages + add
replaces)

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index eb74fd2..577f5c8 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -2,8 +2,6 @@
# Maintainer: Janos Kovacs ja...@frugalware.org
# Contributor: Laszlo Dvornik dvor...@gnome.hu

-pkgname=openoffice.org
-
# build released development version
USE_DEVEL=${USE_DEVEL:-n}
# build directly from git
@@ -11,6 +9,12 @@ USE_GIT=${USE_GIT:-n}
Fuse $USE_GIT  USE_DEVEL=y

if ! Fuse $USE_DEVEL; then
+pkgname=openoffice.org
+else
+pkgname=libreoffice
+fi
+
+if ! Fuse $USE_DEVEL; then
upstream=3.2.1
branch=-3-2-1
tree=ooo320
@@ -29,8 +33,13 @@ else
fi
pkgrel=1
fi
+if ! Fuse $USE_DEVEL; then
pkgdesc=OpenOffice.org, a full office productivity suite.
url=http://www.openoffice.org/;
+else
+pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org.
+url=http://www.documentfoundation.org/download/;
+fi
_F_gnome_desktop=y
Finclude gnome-scriptlet mono kde
unset install
@@ -47,6 +56,9 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 
'gcc-gcj' 'ecj' 'a
'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.3')
groups=('xapps')
archs=('i686' 'x86_64')
+if Fuse $USE_DEVEL; then
+   replaces=('openoffice.org')
+fi
if ! Fuse $USE_DEVEL; then
up2date=lynx -dump http://download.openoffice.org/source/|grep Source|sed 
's/.* \(.*\) .*/\1/;q'
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
 
http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2
 SA40775.diff)
@@ -111,7 +123,7 @@ options=(${optio...@]} 'scriptlet')

subpkgs=($pkgname-kde $pkgname-gnome $pkgname-sdk $pkgname-mono 
$pkgname-mozilla)
subdescs=($pkgname kde integration $pkgname gnome integration \
-   The OpenOffice.org Software Development Kit $pkgname mono 
integration \
+   The $pkgname Software Development Kit $pkgname mono integration \
$pkgname mozilla integration)
subdepends=(kdelibs=$_F_kde_ver \
gnome-vfs libbonobo evolution-data-server-ldap \
@@ -126,6 +138,9 @@ 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   )
+if Fuse $USE_DEVEL; then
+   subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 
'openoffice.org-sdk' 'openoffice.org-mono' 'openoffice.org-mozilla')
+fi

if ! Fuse $USE_DEVEL; then
ooodicts=af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi 
zu ca he ro
@@ -141,8 +156,13 @@ fi
i=0
while [ $i -lt ${#ooosubpk...@]} ]
do
-   subpkgs=(${subpk...@]} openoffice.org-i18n-`echo 
${ooosubpkgs[$i]}|tr [A-Z] [a-z]`)
+   subpkgs=(${subpk...@]} $pkgname-i18n-`echo ${ooosubpkgs[$i]}|tr 
[A-Z] [a-z]`)
+   if ! Fuse $USE_DEVEL; then
subdescs=(${subdes...@]} ${ooosubdescs[$i]} Localization for 
OpenOffice.org.)
+   else
+   subdescs=(${subdes...@]} ${ooosubdescs[$i]} Localization for 
LibreOffice.)
+   subreplaces=(${subreplac...@]} openoffice.org-i18n-`echo 
${ooosubpkgs[$i]}|tr [A-Z] [a-z]`)
+   fi
i=$(($i+1))
done

@@ -150,7 +170,7 @@ i=0
while [ $i -lt ${#ooosubpk...@]} ]
do
if ! Fuse $USE_DEVEL  echo $ooodicts|grep -q ${ooosubpkgs[$i]}; then
-   subinstall=(${subinsta...@]} 
openoffice.org-i18n-${ooosubpkgs[$i]}.install)
+   subinstall=(${subinsta...@]} 
$pkgname.org-i18n-${ooosubpkgs[$i]}.install)
else
subinstall=(${subinsta...@]} '')
fi
@@ -161,16 +181,16 @@ i=0
while [ $i -lt ${#ooosubpk...@]} ]
do
subdepends=(${subdepen...@]} )
-subrodepends=(${subrodepen...@]} openoffice.org=$pkgver)
+subrodepends=(${subrodepen...@]} $pkgname=$pkgver)
subgroups=(${subgrou...@]} locale-extra)
subarchs=(${subarc...@]} i686 x86_64)
i=$(($i+1))
done

if ! Fuse $USE_DEVEL; then
-   dictpath=/usr/lib/openoffice.org/share/extension/install
+   dictpath=/usr/lib/$pkgname/share/extension/install
else
-   dictpath=/usr/lib/openoffice.org/share/extensions
+   dictpath=/usr/lib/$pkgname/share/extensions
fi

gen_dict_scriptlet()
@@ -238,10 +258,10 @@ build()

if ! Fuse $USE_DEVEL; then
# Generate the dict scriptlets
-   gen_dict_scriptlet en openoffice.org.install
+   gen_dict_scriptlet en $pkgname.install
for i in $ooodicts
do
-   gen_dict_scriptlet $i openoffice.org-i18n-$i.install
+

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

2010-11-13 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55fb2de1489353bd2fa3321e4ea9d25c27e90c4a

commit 55fb2de1489353bd2fa3321e4ea9d25c27e90c4a
Author: Miklos Vajna vmik...@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
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-10-12 Thread Miklos Vajna 
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=('42066401ccea56752bc2701fa5166ee4775e' \
-  '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
+

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

2010-09-29 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00cba69a1599e5aea8dfe4527eb123ba86d3435b

commit 00cba69a1599e5aea8dfe4527eb123ba86d3435b
Author: Miklos Vajna vmik...@frugalware.org
Date:   Wed Sep 29 12:35:04 2010 +0200

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
* update to 3.2.99.1
* ooo-build now got renamed to libreoffice
* drop download_external_sources.sh, it's now part of the release
tarball

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index d7a7506..07a6f50 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.98.1
+   pkgver=3.2.99.1
fi
pkgrel=1
fi
@@ -33,10 +33,10 @@ pkgdesc=OpenOffice.org, a full office productivity suite.
url=http://www.openoffice.org/;
_F_gnome_desktop=y
Finclude gnome-scriptlet mono kde
-install=openoffice.org.install
+unset install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt=4.4.0-2' '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')
+'unixodbc' 'libxaw=1.0.5' 'libxslt' 'startup-notification=0.9-3' 
'libwpd=0.8.13' 'poppler' 'libboost-mt')
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
# lucene can be any 2.x version actually
@@ -55,56 +55,54 @@ else
if Fuse $USE_GIT; then
unset source signatures
_F_scm_type=git
-   
_F_scm_url=git://anongit.freedesktop.org/git/ooo-build/ooo-build
+   _F_scm_url=git://anongit.freedesktop.org/git/libreoffice/build
_F_scm_tag=$pkgver
Finclude scm
else
-   _F_archive_name=ooo-build
+   _F_archive_name=libreoffice-build
up2date=Flasttar http://download.go-oo.org/3.3/;
-   
source=(http://download.go-oo.org/3.3/ooo-build-$pkgver-artwork.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-base.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-bootstrap.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-calc.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-components.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-extensions.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-extras.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-filters.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-help.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-impress.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-l10n.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-core.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-extern-sys.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-extern.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-gui.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-postprocess.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-sdk.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-testing.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-ure.tar.bz2
-   
http://download.go-oo.org/3.3/ooo-build-$pkgver-writer.tar.bz2
-   http://download.go-oo.org/3.3/ooo-build-$pkgver.tar.gz \
-   download_external_sources.sh)
-   sha1sums=('a466bce7131a42ae7bf47c3b309507812951bb41' \
- '50c2deda9f71d20c404036851fc1df784b936e51' \
- '3b595ca30f3a190c5644501805b60d88f65a3a95' \
- 'cb663c372dffd488a63c3b8c545bd698725abfd8' \
- '8b1a5ff8f20b7219469d70a2da6cc50889d6aa3f' \
- 'aa0dc2bc6122c019afdfdca5fac4d9e0c06f4aa1' \
- '3b0d2c2487d2aa36535edee64ce899763133329d' \
- '21358f5259c6089d12d4466077738396423e733d' \
- 'f3ca8e1833e5d734f697964c36224163f5332743' \
- '3efb72bf01caa29add4d06e228bb04cf81a40621' \
- 'e04c6af5aa8a1a79bdbfc242158d6bdf973ff37c' \
- '779a649dfb4cbc05feafc78263742c58ad47791a' \
- '8395ecd50698179164188eceee02d77cf273de06' \
-

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

2010-09-10 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c138ba840c54c24b167fdec60bb8ac8a6c4a689e

commit c138ba840c54c24b167fdec60bb8ac8a6c4a689e
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Sep 10 00:28:34 2010 +0200

openoffice.org-3.2.1-6-i686

- USE_DEVEL: update to ooo330-m7

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index ea33999..7a428f9 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -16,8 +16,8 @@ else
upstream=3.3.0
branch=
tree=ooo330
-   milestone=4
-   pkgver=$upstream${tree}_m$milestone.15004.g3ebd5a2
+   milestone=7
+   pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
pkgrel=1
fi
pkgdesc=OpenOffice.org, a full office productivity suite.
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-09-05 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7909e5515ef26ac9d425614a8a19fcd570e53426

commit 7909e5515ef26ac9d425614a8a19fcd570e53426
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Sep 5 12:17:18 2010 +0200

openoffice.org-3.2.1-6-i686

- rebuild with gstreamer=0.10.30-2 (python 2.7)

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 41988a0..ea33999 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -10,7 +10,7 @@ if ! Fuse $USE_DEVEL; then
tree=ooo320
milestone=19
pkgver=$upstream
-   pkgrel=5
+   pkgrel=6
snapshot=4-23-ge68b7f9
else
upstream=3.3.0
@@ -33,7 +33,7 @@ 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' \
'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
-'patch=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 
'gst-plugins-base' \
+'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.3')
groups=('xapps')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git