From be5b19a5d14905a21a6c19e92e9229eef1301919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 27 Jan 2017 20:43:25 +0100 Subject: [PATCH] libreoffice: update to 5.2.5.1 Also add vlc support and neon for WebDAV. --- .../libreoffice/patches/0010-musl-vlc.patch | 10 ++++++++++ srcpkgs/libreoffice/template | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/libreoffice/patches/0010-musl-vlc.patch diff --git a/srcpkgs/libreoffice/patches/0010-musl-vlc.patch b/srcpkgs/libreoffice/patches/0010-musl-vlc.patch new file mode 100644 index 0000000000..89559176c1 --- /dev/null +++ b/srcpkgs/libreoffice/patches/0010-musl-vlc.patch @@ -0,0 +1,10 @@ +--- avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100 ++++ avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100 +@@ -15,6 +15,7 @@ + #if defined(_WIN32) + typedef __int64 libvlc_time_t; + #else ++# include + typedef int64_t libvlc_time_t; + #endif + diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 4edab42adc..c2b4704edf 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,6 +1,6 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=5.2.4.2 +version=5.2.5.1 revision=1 build_style=gnu-configure configure_args="--disable-werror" @@ -8,7 +8,7 @@ nopie=yes nocross=yes # -# XXX: mit-krb5-devel nasm neon openjdk vlc hamcrest iwyu ogl-math +# XXX: mit-krb5-devel nasm openjdk hamcrest iwyu ogl-math # Missing, required libraries are downloaded and built internally # hostmakedepends="automake libtool pkg-config bison flex gperf icu @@ -19,13 +19,14 @@ makedepends="apr-devel boost-devel cups-devel libcurl-devel libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel MesaLib-devel nss-devel python3-devel libressl-devel libgcrypt-devel libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel - liborcus11-devel lpsolve-devel unixodbc-devel libXt-devel + liborcus11-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel libexttextcat-devel liblangtag-devel libldap-devel libmspub-devel libmwaw-devel glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel libpagemaker-devel librevenge-devel libvisio-devel libetonyek-devel libwpd-devel libwpg-devel - telepathy-glib-devel libwps-devel mdds0 mythes-devel opencollada-devel vigra-devel" + telepathy-glib-devel libwps-devel mdds0 mythes-devel opencollada-devel vigra-devel + vlc-devel" depends="hyphen openldap sane" short_desc="Productivity suite, formerly OpenOffice.org" maintainer="Jürgen Buchmüller " @@ -57,10 +58,10 @@ distfiles=" ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip " checksum=" - 8b73d1afa6a1ff6bc153ab1f31afc86c42cc8d0e5831bf82e66a8df0fcf6eb10 - 185e420b6ef7146f971f33663aec8745bf23356ad8894bf82c5b7efad8e7344c - fef3a7699d20e198ac66267f50ffce5bcbef48617434af477de8887340ebe182 - 620cab5f916663275895a9b50b8e00f7e96dbd8dc8129e79bc266274af3cae1c + 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 + a892f933b7da5dda3e4c5d399096cde77d75c4beb8bdf6ea64442ab6890dc357 + 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 + abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353 cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d @@ -135,6 +136,7 @@ do_configure() { configure_args+=" --disable-odk" configure_args+=" --enable-python=system" configure_args+=" --enable-gtk3" + configure_args+=" --enable-vlc" configure_args+=" --disable-dependency-tracking" configure_args+=" --enable-release-build=yes" configure_args+=" --disable-dconf" @@ -214,6 +216,7 @@ do_configure() { configure_args+=" --with-system-odbc" configure_args+=" --with-system-openldap" configure_args+=" --with-system-openssl" + configure_args+=" --with-system-neon" configure_args+=" --with-system-postgresql" configure_args+=" --with-system-firebird" configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"