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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5CEF159C9B for ; Sun, 11 Aug 2024 06:58:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C66C2BC084; Sun, 11 Aug 2024 06:58:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 069E62BC084 for ; Sun, 11 Aug 2024 06:58:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99E0734311A for ; Sun, 11 Aug 2024 06:58:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9292E1ED0 for ; Sun, 11 Aug 2024 06:58:17 +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: <1723357209.2d667ee0106e81d5dceabb15bde4e1ec4fd39330.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-9999.ebuild app-office/calligra/metadata.xml X-VCS-Directories: app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2d667ee0106e81d5dceabb15bde4e1ec4fd39330 X-VCS-Branch: master Date: Sun, 11 Aug 2024 06:58:17 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d61bce8-6ea4-46b9-ad71-4f0c1e847a53 X-Archives-Hash: 3898ba551fc190b9fc88ba8299a44460 commit: 2d667ee0106e81d5dceabb15bde4e1ec4fd39330 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 9 17:57:37 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 11 06:20:09 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d667ee0 app-office/calligra: Add IUSE webengine, drop obsolete src_prepare() Upstream commits: e876a0402c3f50e9c35cb9ec217bf46273a50c6b 8f124e62623820882fc0dbbcaa3547c06c74eda5 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-9999.ebuild | 12 +++--------- app-office/calligra/metadata.xml | 1 + 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index e07d50bb97..599bc227ca 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -26,7 +26,7 @@ CAL_FTS=( karbon sheets stage words ) LICENSE="GPL-2" SLOT="0" IUSE="+charts +crypt +fontconfig gemini gsl +import-filter +lcms - okular +pdf phonon spacenav +truetype X + okular +pdf phonon spacenav +truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" RESTRICT="test" @@ -84,6 +84,7 @@ COMMON_DEPEND=" phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) " @@ -110,14 +111,6 @@ pkg_setup() { check-reqs_pkg_setup } -src_prepare() { - ecm_src_prepare - - # Unconditionally disable deprecated deps (required by QtQuick1) - ecm_punt_qt_module Declarative - ecm_punt_qt_module OpenGL -} - src_configure() { local cal_ft myproducts @@ -157,6 +150,7 @@ src_configure() { -DWITH_Eigen3=$(usex calligra_features_sheets) -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) -DWITH_Freetype=$(usex truetype) + $(cmake_use_find_package webengine Qt6WebEngineWidgets) ) ecm_src_configure diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index c18f607fe5..d1459fc538 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -21,5 +21,6 @@ Enable bindings for kde-apps/okular Build stage/eventplugins and videoshape plugin using media-libs/phonon Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav + Enable Braindump support using dev-qt/qtwebengine