From acb95aecfb826d6ac073f4b1128a0feaa6e4f5e8 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 12 Feb 2016 19:16:24 +0000 Subject: [PATCH] extra/libreoffice-still to 5.0.4-2 --- extra/libreoffice-still/PKGBUILD | 63 ++++++++++--------- extra/libreoffice-still/libreoffice-still.csh | 2 +- extra/libreoffice-still/libreoffice-still.sh | 2 +- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index e30a8e94f..118388fd7 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -11,20 +11,20 @@ highmem=1 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=4.4.7.2 -pkgver=4.4.7 -pkgrel=4 +_LOver=5.0.4.2 +pkgver=5.0.4 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" -makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' # 'libwps' +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'gst-plugins-base-libs' 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' - 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene' + 'gperf' 'kdelibs' 'cppunit' 'beanshell2' 'vigra' 'clucene' #'gtk3' 'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker' @@ -56,7 +56,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 ${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2014-12-03.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip @@ -64,9 +64,8 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz - ${_additional_source_url}/libfreehand-0.1.0.tar.bz2 + ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 - ${_additional_source_url}/libwps-0.3.1.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff libreoffice-still.sh libreoffice-still.csh) @@ -91,7 +90,7 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2014-12-03.tar.bz2 + language-subtag-registry-2015-08-04.tar.bz2 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 OpenCOLLADA-master-6509aa13af.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip @@ -99,15 +98,15 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz - libfreehand-0.1.0.tar.bz2 + libfreehand-0.1.1.tar.bz2 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 - libwps-0.3.1.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll) -md5sums=('ed22391a277699b8d9839e2bca997f06' +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) +md5sums=('0c6381581f93ef7142b00837002755dd' 'SKIP' - 'ac69200cb1b65dda045e001f551dbd7b' + '82f2dcd28e6bfe33e0edb480b9c8f8e4' 'SKIP' - 'a577b6c88fbaa8128b55357cfb4c7433' + '73711d36f4d16b0e2657367c823e1872' 'SKIP' 'd6eef4b4cacb2183f2bf265a5a03a354' '1f24ab1d39f4a51faf22244c94a6203f' @@ -130,7 +129,7 @@ md5sums=('ed22391a277699b8d9839e2bca997f06' '10d61fbaa6a06348823651b1bd7940fe' '7681383be6ce489d84c1c74f4e7f9643' '0168229624cfac409e766913506961a8' - '0f2677ec23bb43ddc7355d1b4cc8ed45' + 'bf5986dbfa1c9a0f26cf1b00ed369484' '4b87018f7fff1d054939d19920b751a0' '4ca8a6ef0afeefc864e9ef21b9f14bd6' '17410483b5b5f267aa18b7e00b65e6e0' @@ -138,14 +137,12 @@ md5sums=('ed22391a277699b8d9839e2bca997f06' 'd8bd5eed178db6e2b18eeed243f85aa8' 'ba2930200c9f019c2d93a8c88c651a0f' '5821b806a98e6c38370970e682ce76e8' - '5f029fef73e42a2c2ae4524a7513f97d' + '8cf70c5dc4d24d2dc4a107f509d2d6d7' '36271d3fa0d9dec1632029b6d7aac925' - 'a111d9ef5a0dab564e9aec0f2cf8d218' '185d60944ea767075d27247c3162b3bc' 'dcb5ad3e5f7139227677ea064b075422' - '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') -validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) + '40680393752d98bcb590f1f62efa61a9' + 'f82232620f3e27d1532c49af4b36ce9a') prepare() { cd libreoffice-$_LOver @@ -172,15 +169,16 @@ prepare() { esac ARCH_FLAGS="$ARCH_FLAGS $i" done + # i686 build broken [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk - + # qt4 fix sed -i "s:qmake:qmake-qt4:g" configure.ac - # Fix build with mdds 1.0 - sed -i "s:\[mdds >= 0.11.2\]:\[mdds-1.0 >= 1.0.0\]:" configure.ac + # fix build with mdds 1.0 + sed -i "s:\[mdds >= 0.12.0\]:\[mdds-1.0 >= 1.0.0\]:" configure.ac # fix test with libetonyek 0.1.4+ mv writerperfect/qa/unit/data/impress/libetonyek/{fail,pass}/v6.zip @@ -191,7 +189,7 @@ build() { # strip -s from Makeflags in case you use it to shorten build logs _MAKEFLAGS=${MAKEFLAGS/-s/} - + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ --enable-split-app-modules \ --with-parallelism=${_MAKEFLAGS/-j/} \ @@ -211,7 +209,7 @@ build() { --disable-gnome-vfs\ --disable-kde\ --enable-kde4\ - --enable-gtk3 \ + --disable-gtk3 \ --disable-gstreamer-0-10 \ --disable-gconf \ --disable-lockdown \ @@ -257,7 +255,7 @@ build() { --with-system-glew \ --with-system-glm \ --with-system-libwpg \ - --without-system-libwps \ + --with-system-libwps \ --with-system-redland\ --with-system-serf \ --without-system-npapi-headers \ @@ -273,11 +271,10 @@ build() { --with-alloc=system \ --with-system-clucene \ --disable-dependency-tracking \ - --enable-hardlink-deliver \ - --without-junit + --enable-hardlink-deliver touch src.downloaded - make build-nocheck + make build # use this if i686 fails #make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck @@ -312,11 +309,15 @@ package_libreoffice-still-sdk() { # fix permissions find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + + + # add LibreOfficeKit headers; FS#48066 + install -dm755 ${pkgdir}/usr/include/LibreOfficeKit + install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit } package_libreoffice-still() { pkgdesc="LibreOffice maintenance branch" - depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' # 'libwps' + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' @@ -337,7 +338,7 @@ package_libreoffice-still() { 'libpaper: takes care of papersize' 'postgresql-libs: for postgresql-connector' 'coin-or-mp: required by the Calc solver' - 'gtk3: for GTK3 integration' + #'gtk3: for GTK3 integration' 'kdelibs: for KDE desktop integration') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc diff --git a/extra/libreoffice-still/libreoffice-still.csh b/extra/libreoffice-still/libreoffice-still.csh index 502512189..aad5933b6 100644 --- a/extra/libreoffice-still/libreoffice-still.csh +++ b/extra/libreoffice-still/libreoffice-still.csh @@ -3,4 +3,4 @@ #setenv SAL_USE_VCLPLUGIN gen #setenv SAL_USE_VCLPLUGIN kde4 #setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 +#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available diff --git a/extra/libreoffice-still/libreoffice-still.sh b/extra/libreoffice-still/libreoffice-still.sh index 7bfdcf7f6..29d32b381 100644 --- a/extra/libreoffice-still/libreoffice-still.sh +++ b/extra/libreoffice-still/libreoffice-still.sh @@ -3,4 +3,4 @@ #export SAL_USE_VCLPLUGIN=gen #export SAL_USE_VCLPLUGIN=kde4 #export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 +#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available