From c278bbf71798770baeb919a2c8485a4b6f57ae2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 20 May 2019 14:32:34 +0200 Subject: [PATCH] libreoffice: update to 6.2.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add subpackage libreoffice-kde for KDE integration. Closes: #9234 Signed-off-by: Jürgen Buchmüller --- srcpkgs/libreoffice-kde | 1 + srcpkgs/libreoffice/patches/boost-1.69.patch | 11 ----- srcpkgs/libreoffice/template | 51 ++++++++++++-------- 3 files changed, 32 insertions(+), 31 deletions(-) create mode 120000 srcpkgs/libreoffice-kde delete mode 100644 srcpkgs/libreoffice/patches/boost-1.69.patch diff --git a/srcpkgs/libreoffice-kde b/srcpkgs/libreoffice-kde new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-kde @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/patches/boost-1.69.patch b/srcpkgs/libreoffice/patches/boost-1.69.patch deleted file mode 100644 index 2b95ca7849c..00000000000 --- a/srcpkgs/libreoffice/patches/boost-1.69.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sfx2/source/appl/shutdownicon.cxx 2018-12-12 22:59:14.000000000 +0100 -+++ - 2018-12-19 00:29:14.290274270 +0100 -@@ -141,7 +141,7 @@ - #endif // ENABLE_QUICKSTART_APPLET - } - assert(!boost::logic::indeterminate(loaded)); -- return loaded; -+ return bool{loaded}; - } - - } diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 6b674997fb0..20f266aa5e0 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ #!/bin/sh # Template file for 'libreoffice' pkgname=libreoffice -version=6.2.0.3 +version=6.2.4.2 revision=1 build_style=meta make_build_args="build-nocheck" @@ -12,18 +12,18 @@ nocross=yes # Missing, required libraries are downloaded and built internally # hostmakedepends="automake flex git gperf hyphen icu libtool openldap - perl-Archive-Zip pkg-config sane ucpp unzip wget zip python3-setuptools" -makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel - gpgmepp-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel hunspell-devel - hyphen-devel libXt-devel libabw-devel libatomic_ops-devel libbluetooth-devel - libcdr-devel libcmis-devel libe-book-devel libepubgen-devel libetonyek-devel - libexttextcat-devel libfreehand-devel libgcrypt-devel libgltf-devel - libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel - libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel - libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds mythes-devel - neon-devel nss-devel postgresql-libs-devel python3-devel - redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel - vlc-devel libcppunit-devel" + perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip wget zip python3-setuptools" +makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel + frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel + gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel + libatomic_ops-devel libbluetooth-devel libcdr-devel libcmis-devel libe-book-devel + libepubgen-devel libetonyek-devel libexttextcat-devel libfreehand-devel + libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel + libmwaw-devel libnumbertext-devel libodfgen-devel liborcus-devel + libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel + libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel + postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel + telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel" depends="libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" @@ -73,7 +73,7 @@ distfiles=" ${_addurl}/libstaroffice-0.0.6.tar.xz ${_addurl}/libzmf-0.0.2.tar.xz ${_addurl}/pdfium-3550.tar.bz2 - ${_addurl}/poppler-0.73.0.tar.xz + ${_addurl}/poppler-0.74.0.tar.xz ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar @@ -117,10 +117,10 @@ distfiles=" ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade - 3130b0046c56af77edca2d2d8b2f069b9d109a4e83b6c8f415fa8caa2a10c51d - a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc - 9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03 +checksum="ff8148e7a7bc8988677ca565d6d25c1ade93e848df6b4163459a5cc3682a38b7 + 21d16b922d7a218dd104571ae37421fcbc1ae90e5fd61c7b16fee33e4ac4e057 + 1aa5469a25d4a615b521d0775b08501ea4672994c5135bcde7c054c327aa2e7f + 4c4cf8e26b14e508f1a1fdf2db1a2363964ae5d528b5bd5f048a281ddecc1e2a 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -133,7 +133,7 @@ checksum="87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679 - e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03 + 92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504 @@ -192,7 +192,7 @@ skip_extraction=" libstaroffice-0.0.6.tar.xz libzmf-0.0.2.tar.xz pdfium-3550.tar.bz2 - poppler-0.73.0.tar.xz + poppler-0.74.0.tar.xz bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar @@ -463,6 +463,8 @@ do_configure() { opts+=" --disable-online-update" opts+=" --enable-python=system" opts+=" --enable-gtk3" + opts+=" --enable-qt5" + opts+=" --enable-kde5" opts+=" --enable-vlc" opts+=" --disable-dependency-tracking" opts+=" --enable-release-build" @@ -608,6 +610,15 @@ libreoffice-impress_package() { } } +libreoffice-kde_package() { + short_desc+=" - KDE integration" + depends="libreoffice-common>=${version}_${revision}" + noverifyrdeps=yes + pkg_install() { + _split kde4 + } +} + libreoffice-kit_package() { short_desc+=" - development files" pkg_install() {