From cec37dc2598e99112f49592fc0eaa97af0aa1e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 20 May 2019 11:07:29 +0200 Subject: [PATCH] Revert "libreoffice: enable KDE/Qt integration" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d650267bbe08dd1e2eb31314810cec46941a3168. Signed-off-by: Jürgen Buchmüller --- srcpkgs/libreoffice-kde | 1 - srcpkgs/libreoffice/template | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/libreoffice-kde diff --git a/srcpkgs/libreoffice-kde b/srcpkgs/libreoffice-kde deleted file mode 120000 index d5e3a56f35..0000000000 --- a/srcpkgs/libreoffice-kde +++ /dev/null @@ -1 +0,0 @@ -libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 3592dfd0dd..6b674997fb 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,6 +1,7 @@ +#!/bin/sh # Template file for 'libreoffice' pkgname=libreoffice -version=6.2.3.2 +version=6.2.0.3 revision=1 build_style=meta make_build_args="build-nocheck" @@ -10,7 +11,7 @@ nocross=yes # XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math poppler # Missing, required libraries are downloaded and built internally # -hostmakedepends="automake flex git gperf hyphen icu libtool openldap qt5-qmake +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 @@ -20,9 +21,9 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-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 + neon-devel nss-devel postgresql-libs-devel python3-devel redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel - vlc-devel libcppunit-devel frameworkintegration-devel" + vlc-devel libcppunit-devel" depends="libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" @@ -116,10 +117,10 @@ distfiles=" ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="0e1d4fc442e21a163cd4a4e356b94ac99865d1d02b2d36e472b1ec232c22595c - 695a880cbea94eb34ccc31ebe65432052b5a9be87ef9f55ea447606d446dc162 - 3444086cf346a20c76b68564a4890152674656d595fb20fdd47b613c6569cf19 - be2e48e40ce14d68649e118846c993d34186ac13a1f4c3c53b988ef573260da0 +checksum="87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade + 3130b0046c56af77edca2d2d8b2f069b9d109a4e83b6c8f415fa8caa2a10c51d + a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc + 9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -462,8 +463,6 @@ 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" @@ -600,15 +599,6 @@ libreoffice-gnome_package() { } } -libreoffice-kde_package() { - short_desc+=" - KDE integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes - pkg_install() { - _split kde4 - } -} - libreoffice-impress_package() { short_desc+=" - Presentation application" depends="libreoffice-common>=${version}_${revision}"