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 B9D39138334 for ; Sun, 11 Nov 2018 12:05:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7415E0D80; Sun, 11 Nov 2018 12:05:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 95D26E0D80 for ; Sun, 11 Nov 2018 12:05:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 186E4335C3D for ; Sun, 11 Nov 2018 12:05:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D26A3DA for ; Sun, 11 Nov 2018 12:05:51 +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: <1541931648.7e6a94ada2ab0bca395bb82c499fcbb640568885.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-9999.ebuild app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch app-office/calligra/metadata.xml X-VCS-Directories: app-office/calligra/ app-office/calligra/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e6a94ada2ab0bca395bb82c499fcbb640568885 X-VCS-Branch: master Date: Sun, 11 Nov 2018 12:05:51 +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: 68e2acc4-1cc8-4a48-8658-e10b40d1a13d X-Archives-Hash: 6f2bd3b4a78809a3a22635432c9e602c commit: 7e6a94ada2ab0bca395bb82c499fcbb640568885 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 11 10:16:12 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 11 10:20:48 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e6a94ad app-office/calligra: calligraplan moved into separate repository Upstream commit fe117b16d8c32c028c7b722c07b33e386783b5c1 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-9999.ebuild | 46 ++++++---------------- .../files/calligra-3.1.0-no-arch-detection.patch | 17 -------- .../files/calligra-3.1.89-no-arch-detection.patch | 17 ++++++++ app-office/calligra/metadata.xml | 2 +- 4 files changed, 30 insertions(+), 52 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index c300be6a08..c8bdc8cb76 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -1,40 +1,30 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 +if [[ ${KDE_BUILD_TYPE} == release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + CHECKREQS_DISK_BUILD="4G" KDE_HANDBOOK="forceoptional" -KDE_PO_DIRS="po plan/po" KDE_TEST="forceoptional" inherit check-reqs kde5 DESCRIPTION="KDE Office Suite" HOMEPAGE="https://www.calligra.org/" -[[ ${KDE_BUILD_TYPE} == release ]] && \ - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz - calligra_features_plan? ( mirror://kde/stable/${PN}/${PN}plan-${PV}.tar.xz )" - -LICENSE="GPL-2" - -[[ ${KDE_BUILD_TYPE} == release ]] && \ -KEYWORDS="~amd64 ~x86" -CAL_FTS=( karbon plan sheets words ) +CAL_FTS=( karbon sheets words ) +LICENSE="GPL-2" IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) calligra_experimental_features_stage" # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) # Required for the matlab/octave formula tool -# FIXME: Disabled by upstream for good reason -# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) -# $(add_kdeapps_dep akonadi) -# $(add_kdeapps_dep akonadi-contacts) -# Currently upstream-disabled in plan -# =dev-libs/kproperty-3.0*:5 -# =dev-libs/kreport-3.0*:5 COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcmutils) @@ -98,6 +88,7 @@ COMMON_DEPEND=" openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) + pim? ( $(add_kdeapps_dep kcalcore) ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( @@ -108,16 +99,10 @@ COMMON_DEPEND=" $(add_qt_dep qtwebkit) okular? ( $(add_kdeapps_dep okular) ) ) - calligra_features_plan? ( - $(add_frameworks_dep kholidays) - $(add_frameworks_dep khtml) + calligra_features_sheets? ( + dev-cpp/eigen:3 dev-libs/kdiagram:5 - pim? ( - $(add_kdeapps_dep kcalcore) - $(add_kdeapps_dep kcontacts) - ) ) - calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( $(add_kdeapps_dep okular) ) @@ -136,7 +121,7 @@ RDEPEND="${COMMON_DEPEND} " RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}"-3.1.0-no-arch-detection.patch ) +PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch ) pkg_pretend() { check-reqs_pkg_pretend @@ -148,12 +133,6 @@ pkg_setup() { } src_prepare() { - if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then - mv ../${PN}plan-${PV} plan || die - sed -e "/add_subdirectory(plan)/s/#//" \ - -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ - -i CMakeLists.txt || die - fi kde5_src_prepare if ! use test; then @@ -215,7 +194,6 @@ src_configure() { -DWITH_LibWps=$(usex import-filter) $(cmake-utils_use_find_package phonon Phonon4Qt5) $(cmake-utils_use_find_package pim KF5CalendarCore) - $(cmake-utils_use_find_package pim KF5Contacts) -DWITH_LCMS2=$(usex lcms) -DWITH_Okular5=$(usex okular) -DWITH_OpenEXR=$(usex openexr) diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch deleted file mode 100644 index aa83ba1a30..0000000000 --- a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. - -Gentoo-bug: 584118 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -617,10 +617,6 @@ - endif() - endmacro() - -- if (NOT PACKAGERS_BUILD) -- # Optimize the whole Calligra for current architecture -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") -- endif () - endif() - set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) - diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch new file mode 100644 index 0000000000..f4efa3d81a --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch @@ -0,0 +1,17 @@ +Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. + +Gentoo-bug: 584118 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -617,10 +617,6 @@ + endif() + endmacro() + +- if (NOT PACKAGERS_BUILD) +- # Optimize the whole Calligra for current architecture +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") +- endif () + endif() + set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) + diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index d7ebffccf0..575f0b0a91 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -13,10 +13,10 @@ Enable kactivities support Enable tablet and 2:1 devices support Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote - Enable support for KDE PIM resources integration Build colorengine plugins using media-libs/lcms Enable bindings for kde-apps/okular Build stage/eventplugins and videoshape plugin using media-libs/phonon + Enable support for KDE PIM resources integration Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav