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 C3FDD138331 for ; Wed, 24 Jan 2018 12:46:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 161F7E0971; Wed, 24 Jan 2018 12:46:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 DD648E0971 for ; Wed, 24 Jan 2018 12:46:57 +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 7B827335C33 for ; Wed, 24 Jan 2018 12:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 149AA1CF for ; Wed, 24 Jan 2018 12:46:55 +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: <1516797999.e82b4313d11aceba23245ee0c1fde15f21e57018.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild app-office/libreoffice/metadata.xml X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e82b4313d11aceba23245ee0c1fde15f21e57018 X-VCS-Branch: master Date: Wed, 24 Jan 2018 12:46:55 +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: f815102b-3327-437f-ac62-dc64a704e2cf X-Archives-Hash: be9a0385bff9567e4b394f1963eeaa45 commit: e82b4313d11aceba23245ee0c1fde15f21e57018 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 24 10:56:47 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 24 12:46:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82b4313 app-office/libreoffice: Switch default gtk+ frontend to gtk+3 It is no longer declared experimental in >=6.0. Package-Manager: Portage-2.3.20, Repoman-2.3.6 app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++++++++--------- app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++--------- app-office/libreoffice/metadata.xml | 3 ++- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 5b58caa856a..90f72941a9b 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gst-plugins-base:1.0 ) gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) @@ -426,8 +426,8 @@ src_configure() { $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) @@ -442,7 +442,7 @@ src_configure() { $(use_with odk doxygen) ) - if use eds || use gtk3; then + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -519,7 +519,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # bug 593514 - if use gtk3; then + if use gtk; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 664bacbda8e..7bfe88d60c1 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc +gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gst-plugins-base:1.0 ) gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) @@ -438,8 +438,8 @@ src_configure() { $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) @@ -455,7 +455,7 @@ src_configure() { $(use_with odk doxygen) ) - if use eds || use gtk3; then + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -532,7 +532,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # bug 593514 - if use gtk3; then + if use gtk; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 1d3010d4130..f72d5cc7d18 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -15,7 +15,8 @@ version Enable Collada for rendering 3D models stored in *.dae and *.kmz format Use media-libs/libgltf for inserting 3D models in the glTF format into presentations Enable support for remote files on Google Drive - Enable highly experimental gtk3 frontend + Enable legacy gtk2 frontend + Enable experimental gtk3 frontend Use dev-libs/jemalloc for allocations Build the Office Development Kit Enable PDF import via the Poppler library