Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=673b903500f7add65dc4555dabcfe233fea12708
commit 673b903500f7add65dc4555dabcfe233fea12708 Author: crazy <cr...@frugalware.org> Date: Wed Feb 14 04:42:02 2018 +0100 libreoffice-6.0.1.1-2-x86_64 * rebuild with tc * use system libjpeg-turbo * drop -sdk subpackage diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 086cc12..41a94e5 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -6,13 +6,14 @@ pkgname=libreoffice pkgver=6.0.1.1 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y -pkgrel=1 +pkgrel=2 pkgdesc="Free Software Productivity Suite" url="http://www.libreoffice.org/" Finclude gnome-scriptlet unset install depends=( 'libpng>=1.6.25' + 'libjpeg-turbo' 'clucene' 'cups' 'desktop-file-utils' @@ -50,6 +51,7 @@ depends=( 'mythes' 'neon>=0.26.1' 'openjre' + 'openjre-x' 'perl-archive-zip' 'poppler-glib>=0.62.0' 'python3' @@ -65,6 +67,7 @@ depends=( ) makedepends=( 'apache-ant' + 'openjdk' 'bison' 'bluez' 'boost>=1.61.0' @@ -110,7 +113,6 @@ source+=() signatures+=() ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ - http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz \ http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) @@ -123,23 +125,20 @@ NOEXTRACT=1 options+=('scriptlet') replaces=('calligra' 'calligra-libs' 'calligra-data' 'calligra-tools' 'calligra-docs' \ - 'braindump' 'flow' 'karbon' 'plan' 'stage' 'sheets' 'words') + 'braindump' 'flow' 'karbon' 'plan' 'stage' 'sheets' 'words' "$pkgname-sdk") conflicts=("$replaces[@]}") -subpkgs=("$pkgname-gtk3" "$pkgname-sdk" "$pkgname-postgresql") +subpkgs=("$pkgname-gtk3" "$pkgname-postgresql") subdescs=("$pkgname GTK3 integration" \ - "The $pkgname Software Development Kit" \ "$pkgname postgresql SDBC driver") -subdepends=("gtk+3" "openjdk>=6" "libpq") -subrodepends=("$pkgname>=$pkgver" \ - "$pkgname>=$pkgver" \ - "$pkgname>=$pkgver libkrb5>=1.14.3") -subarchs=("x86_64" 'x86_64' 'x86_64') -subgroups=('xapps-extra' 'devel-extra' 'xapps-extra') -subinstall=("$_F_gnome_scriptlet" "" "") -subreplaces=("$pkgname-gnome" "" "") -subconflicts=("$pkgname-gnome" "" "") +subdepends=("gtk+3" "libpq") +subrodepends=("$pkgname>=$pkgver" "$pkgname>=$pkgver libkrb5>=1.14.3") +subarchs=("x86_64" 'x86_64') +subgroups=('xapps-extra' 'xapps-extra') +subinstall=("$_F_gnome_scriptlet" "") +subreplaces=("$pkgname-gnome" "") +subconflicts=("$pkgname-gnome" "") # 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-valencia cs @@ -274,7 +273,7 @@ build() --with-system-headers \ --with-system-ucpp \ --without-system-hsqldb \ - --without-system-jpeg \ + --with-system-jpeg \ --disable-coinmp \ --with-external-tar=`pwd`/ext_source \ --with-system-jars \ @@ -287,7 +286,8 @@ build() --disable-pdfium \ --disable-firebird-sdbc \ --enable-gtk3 \ - --disable-gtk + --disable-gtk \ + --disable-odk sed -i 's/test `id -u` = 0/false/' Makefile # missing fakeroot detection if [ ! -e src.built ]; then @@ -378,7 +378,6 @@ build() Fsplitgid $pkgname-gtk3 $Fdestdir/gid_Module_Optional_Gnome Fbuild_gnome_scriptlet - Fsplitgid $pkgname-sdk $Fdestdir/gid_Module_Root_SDK Fsplitgid $pkgname-postgresql $Fdestdir/gid_Module_Optional_PostgresqlSdbc Fsplitgid $pkgname-nlpsolver $Fdestdir/gid_Module_Optional_Extensions_NLPSolver Fsplitgid $pkgname-scripting-beanshell $Fdestdir/gid_Module_Optional_Extensions_Script_Provider_For_BS _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git