Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=1819f39b370e0ed932c1fc070ca9c77f08e1f26f
commit 1819f39b370e0ed932c1fc070ca9c77f08e1f26f Author: Miklos Vajna <[email protected]> Date: Wed Nov 28 12:29:46 2012 +0100 libreoffice-4.0.0.0.alpha1-1-x86_64 - further fixes without a relbump - drop not needed saxon tarball - drop empty binfilter subpkg - --with-max-jobs -> --with-parallelism - --enable-ext-scripting-beanshell is the default now - --disable-ldap is the default now diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index d4b04ad..c15f756 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -41,7 +41,6 @@ do done ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ - http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \ http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \ http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ @@ -55,28 +54,25 @@ done NOEXTRACT=1 options=(${options[@]} 'scriptlet') -subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-mozilla" "$pkgname-postgresql" "$pkgname-binfilter") +subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-mozilla" "$pkgname-postgresql") subdescs=("$pkgname kde integration" "$pkgname gnome integration" \ "The $pkgname Software Development Kit" \ "$pkgname mozilla integration" \ - "$pkgname postgresql SDBC driver" \ - "Legacy filters (e.g. StarOffice 5.2) for LibreOffice") + "$pkgname postgresql SDBC driver") subdepends=("kdelibs>=$_F_kde_ver" \ "gnome-vfs libbonobo evolution-data-server-ldap" \ "openjdk>=6" \ "" \ - "libpq" \ - "") + "libpq") subrodepends=("$pkgname=$pkgver" \ "$pkgname=$pkgver" \ "$pkgname=$pkgver" \ "$pkgname=$pkgver" \ - "$pkgname=$pkgver libkrb5" \ - "$pkgname=$pkgver") -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') + "$pkgname=$pkgver libkrb5") +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') # gnome subpkg goes to extra as it pulls in deprecated pkgs -subgroups=('kde' 'gnome-extra' 'devel-extra' 'xapps' 'xapps-extra' 'xapps-extra') -subinstall=("" "$_F_gnome_scriptlet" "" "" "" "") +subgroups=('kde' 'gnome-extra' 'devel-extra' 'xapps' 'xapps-extra') +subinstall=("" "$_F_gnome_scriptlet" "" "" "") # sed ':a;N;$!ba;s/\\\n//g' solenv/inc/langlist.mk|grep ^completelangiso=|sed 's/completelangiso=//;s/en-US //' completelangiso=(af am ar as ast be bg bn bn-IN bo br brx bs ca ca-XV cs cy da @@ -167,7 +163,7 @@ build() # SMP build if [ ! -z "$MAKEFLAGS" ]; then - Fconfopts+=" --with-max-jobs=${MAKEFLAGS/-j}" + Fconfopts+=" --with-parallelism=${MAKEFLAGS/-j}" unset MAKEFLAGS fi @@ -178,6 +174,7 @@ build() for i in ${extensions[@]} do [ $i == scripting-javascript ] && continue + [ $i == scripting-beanshell ] && continue Fconfopts+=" --enable-ext-$i" done Fpatchall @@ -191,11 +188,9 @@ build() --with-jdk-home=$JAVA_HOME \ --enable-kde4 \ --without-fonts \ - --disable-ldap \ --with-system-mozilla=mozilla \ --with-system-libs \ --with-system-headers \ - --without-system-saxon \ --without-system-hsqldb \ --with-external-tar=`pwd`/ext_source \ --without-afms \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
