Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1706db3fa367e72f355c7df4733a434dc030bb1
commit c1706db3fa367e72f355c7df4733a434dc030bb1 Author: Miklos Vajna <[email protected]> Date: Wed Mar 11 09:09:32 2015 +0100 libreoffice-4.4.1.2-1-x86_64 - 4.3.6 -> 4.4.1 - new libpagemaker dependency - use internal boost for now, system one is too old for C++11 - use internal orcus, too -- internal boost + system orcus would result in linker errors - drop mozilla subpkg, it's removed upstream - gstreamer 1.0 support is now enabled by default upstream diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index 1b9d700..720db45 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=libreoffice -pkgver=4.3.6.2 +pkgver=4.4.1.2 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y pkgrel=1 @@ -17,7 +17,9 @@ depends=('libxml2' 'libsndfile' 'openjre' 'fontconfig' 'libpng>=1.4.1' \ 'flex' 'neon>=0.26.1' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ 'unixodbc>=2.3.1' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' \ 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libetonyek' 'libfreehand' 'libmspub' 'libe-book' 'libabw' 'liborcus>=0.7.0' \ - 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat>=3.4.0' 'librdf' 'graphite2' 'libcmis>=0.3.0-2' 'clucene' \ + # required by writerperfect + 'libpagemaker' \ + 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat>=3.4.0' 'librdf' 'graphite2' 'libcmis>=0.5.0' 'clucene' \ 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw>=0.2.0' 'hyphen' 'mythes' \ # required by Base 'libfbembed' \ @@ -62,7 +64,9 @@ ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3 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 \ - http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) + http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip \ + http://dev-www.libreoffice.org/src/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \ + http://dev-www.libreoffice.org/src/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -73,25 +77,22 @@ options+=('scriptlet') # ccache's cache size is less than 5GB, using it is counter-producive for our symbol-enabled build options+=('noccache') -subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-mozilla" "$pkgname-postgresql") +subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-postgresql") subdescs=("$pkgname kde integration" "$pkgname gnome integration" \ "The $pkgname Software Development Kit" \ - "$pkgname mozilla integration" \ "$pkgname postgresql SDBC driver") subdepends=("kdelibs>=$_F_kde_ver" \ "gnome-vfs libbonobo evolution-data-server-ldap" \ "openjdk>=6" \ - "" \ "libpq") subrodepends=("$pkgname=$pkgver" \ "$pkgname=$pkgver" \ "$pkgname=$pkgver" \ - "$pkgname=$pkgver" \ "$pkgname=$pkgver libkrb5") -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subarchs=('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') -subinstall=("" "$_F_gnome_scriptlet" "" "" "") +subgroups=('kde' 'gnome-extra' 'devel-extra' '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-valencia cs @@ -211,6 +212,8 @@ build() --with-system-headers \ --with-system-ucpp \ --without-system-hsqldb \ + --without-system-boost \ + --without-system-orcus \ --disable-coinmp \ --disable-gltf \ --with-external-tar=`pwd`/ext_source \ @@ -218,13 +221,13 @@ build() --with-system-dicts \ --with-external-dict-dir=/usr/share/myspell \ --without-myspell-dicts \ - --disable-gstreamer-0_10 --enable-gstreamer \ --disable-fetch-external \ --enable-release-build \ --disable-dependency-tracking # TODO check why these are failing sed -i 's/add_check_targets/add_subsequentcheck_targets/' i18nlangtag/Module_i18nlangtag.mk sed -i '/sw_ooxmlimport/d' sw/Module_sw.mk + sed -i '/sc_ucalc/d' sc/Module_sc.mk if [ ! -e src.built ]; then make || return 1 @@ -294,13 +297,6 @@ build() Fmanrel sysui/desktop/man/*.1 - # Enable and split the mozilla plugin - Fmkdir /usr/lib/mozilla/plugins - Fln /usr/lib/$pkgname/program/libnpsoplugin.so /usr/lib/mozilla/plugins/ - Fsplit $pkgname-mozilla usr/lib/$pkgname/program/nsplugin \ - usr/lib/mozilla/plugins/libnpsoplugin.so \ - usr/lib/$pkgname/program/libnpsoplugin.so - # Split l10n for i in "${completelangiso[@]}" do _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
