From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CFF1138331 for ; Sun, 28 Jan 2018 23:19:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2687E0B2E; Sun, 28 Jan 2018 23:19:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2387E0B18 for ; Sun, 28 Jan 2018 23:19:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7BC6335C55 for ; Sun, 28 Jan 2018 23:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B97F61B9 for ; Sun, 28 Jan 2018 23:19:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1517181538.5c817e1b0bcc1f067390ff409feff4e8ffd605d6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/Manifest app-office/libreoffice/libreoffice-6.0.9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5c817e1b0bcc1f067390ff409feff4e8ffd605d6 X-VCS-Branch: master Date: Sun, 28 Jan 2018 23:19:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0bfe59c4-ec4e-4c03-a0fd-de026681408c X-Archives-Hash: f6278b7ff121c2886dd29aca8b672fb3 commit: 5c817e1b0bcc1f067390ff409feff4e8ffd605d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 27 19:27:57 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 28 23:18:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c817e1b app-office/libreoffice: Add 6.0 patchset for gtk3-kde5 vcl plugin Switches 6.0 branch USE=kde away from kdelibs4. Thanks-to: Andrius Štikonas stikonas.eu> Bug: https://bugs.gentoo.org/645558 Package-Manager: Portage-2.3.20, Repoman-2.3.6 app-office/libreoffice/Manifest | 1 + app-office/libreoffice/libreoffice-6.0.9999.ebuild | 45 ++++++++++++---------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 83d7c49cecb..ca35e8495a0 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -6,6 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882 +DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 90f72941a9b..4ef05313f50 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -17,7 +17,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" +PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} @@ -26,7 +26,7 @@ unset SCM_ECLASS DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs # Core MUST be first! @@ -157,17 +157,23 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 + dev-qt/qtwidgets:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 + ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - kde? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs - ) " RDEPEND="${COMMON_DEPEND} @@ -230,6 +236,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -244,6 +251,9 @@ PATCHES=( # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602 + + # gtk3-kde5 vcl plugin backported from master + "${WORKDIR}"/${PATCHSET/.tar.xz/} ) pkg_pretend() { @@ -284,13 +294,9 @@ pkg_setup() { } src_unpack() { - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" + default - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - unpack "${PN}-help-${PV}.tar.xz" - else + if [[ ${PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" @@ -305,7 +311,6 @@ src_unpack() { } src_prepare() { - [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" default AT_M4DIR="m4" eautoreconf @@ -360,9 +365,9 @@ src_configure() { export PYTHON_LIBS=$(python_get_LIBS) if use kde; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" + export QT_SELECT=5 # bug 639620 needs proper fix though + export QT5DIR="$(qt5_get_bindir)/../" + export MOC5="$(qt5_get_bindir)/moc" fi # system headers/libs/...: enforce using system packages @@ -398,7 +403,6 @@ src_configure() { --disable-gstreamer-0-10 --disable-online-update --disable-pdfium - --disable-qt5 --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") --with-build-version="Gentoo official package" @@ -421,18 +425,19 @@ src_configure() { $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) - $(use_enable debug) $(use_enable dbus) + $(use_enable debug) $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) + $(use_enable kde gtk3-kde5) + $(use_enable kde qt5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable kde kde4) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id})