[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 95d8cf16652994a8258108f24d1d3c5b739fc9f1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jul 12 18:23:34 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jul 12 18:33:26 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95d8cf16
app-office/calligra: Port to KF6
Upstream commits:
b521108c75668d43e2f6d23c4a5cad0ab4ff6d0c (!)
afb2049d785e7db374d574e675e8ceaad1b1d606
0b68f0629446562d65778993aec127b424d926a3
3073d00995f3fe74edd4f0f3f87bd2c8b58ed4ca
/9dfa7b059e45884eb248c5fc0630b5a7fe43fd92
38f04b4ce76a6420568d1be6cac7776f247f4390
def2ca6a362701dd25a7950cb00ada669ddd1d9c
9197e4b3a43b8d614772f43a31f92729f598e72a
2821efdb5ad1f9aca8036636f7aff197de8a6da7
ff32b06dfbbbadae5de3695de6f6914a62c2b62f
adee19863d5b5a65a1ae8cccdb2d526d2a989e37
Bug: https://bugs.gentoo.org/903532
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/calligra/calligra-.ebuild | 118 -
.../calligra/files/calligra-3.2.1-okularpart.patch | 78 --
app-office/calligra/metadata.xml | 1 -
3 files changed, 46 insertions(+), 151 deletions(-)
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index d8b22023a0..e07d50bb97 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -6,8 +6,8 @@ EAPI=8
CHECKREQS_DISK_BUILD="4G"
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.3.0
+QTMIN=6.6.2
inherit check-reqs ecm kde.org
DESCRIPTION="KDE Office Suite"
@@ -24,8 +24,8 @@ SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
CAL_FTS=( karbon sheets stage words )
LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
+SLOT="0"
+IUSE="+charts +crypt +fontconfig gemini gsl +import-filter +lcms
okular +pdf phonon spacenav +truetype X
$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
@@ -35,48 +35,39 @@ RESTRICT="test"
# Required for the matlab/octave formula tool
COMMON_DEPEND="
dev-lang/perl
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kemoticons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
+ >=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qttools-${QTMIN}:6[designer]
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/sonnet-${KFMIN}:6
sys-libs/zlib
[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 33c264e762caf080f26295d661fe99e1341659c7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 15 11:55:46 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 15 12:38:47 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=33c264e7
app-office/calligra: Switch okularpart headers to okular5
Bug: https://bugs.gentoo.org/926748
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/calligra/calligra-.ebuild | 4 ++
.../calligra/files/calligra-3.2.1-okularpart.patch | 78 ++
2 files changed, 82 insertions(+)
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index 8949f0..d8b22023a0 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -130,6 +130,10 @@ pkg_setup() {
}
src_prepare() {
+ if has_version "media-gfx/okularpart:5"; then
+ eapply "${FILESDIR}/${PN}-3.2.1-okularpart.patch"
+ fi
+
ecm_src_prepare
# Unconditionally disable deprecated deps (required by QtQuick1)
diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch
b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
new file mode 100644
index 00..75a3b0d054
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
@@ -0,0 +1,78 @@
+From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Fri, 15 Mar 2024 12:39:45 +0100
+Subject: [PATCH] Switch okular headers to okular5
+
+Otherwise it will be using okular6's.
+
+Signed-off-by: Andreas Sturmlechner
+---
+ extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +-
+ extras/okularodpgenerator/OkularOdpGenerator.h | 6 +++---
+ extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +-
+ extras/okularodtgenerator/OkularOdtGenerator.h | 6 +++---
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp
b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+index 823d039b3b0..a4614f38f6b 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.cpp
b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+@@ -33,7 +33,7 @@
+ #include
+ #include
+
+-#include
++#include
+
+ #include
+
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h
b/extras/okularodpgenerator/OkularOdpGenerator.h
+index 9107c52c52b..5564ec7f881 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.h
b/extras/okularodpgenerator/OkularOdpGenerator.h
+@@ -22,9 +22,9 @@
+
+ #include "kookulargenerator_odp_export.h"
+
+-#include
+-#include
+-#include
++#include
++#include
++#include
+
+ class KoPADocument;
+
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp
b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+index 9ba114d6080..bccfb11a068 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.cpp
b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+@@ -41,7 +41,7 @@
+ #include
+ #include
+
+-#include
++#include
+
+
+ OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList
)
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h
b/extras/okularodtgenerator/OkularOdtGenerator.h
+index d3e9692b385..994a81aae2c 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.h
b/extras/okularodtgenerator/OkularOdtGenerator.h
+@@ -22,9 +22,9 @@
+
+ #include "kookulargenerator_odt_export.h"
+
+-#include
+-#include
+-#include
++#include
++#include
++#include
+
+ class KWDocument;
+
+--
+2.44.0
+
[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: a62b5b9c5510874dfd1198f9e17d2b7169155d51
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 29 12:58:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 29 13:33:44 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a62b5b9c
app-office/calligra: Switch to patchset, drop KF5Kross dependency
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/calligra/calligra-.ebuild| 10 --
.../files/calligra-3.1.89-no-arch-detection.patch | 17 -
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index 8d5898f7f5..b36dd7f1d2 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -18,6 +18,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~ppc64 ~x86"
fi
+PATCHSET="${PN}-3.2.1-patchset-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
+
CAL_FTS=( karbon sheets stage words )
LICENSE="GPL-2"
@@ -62,7 +65,6 @@ COMMON_DEPEND="
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
@@ -114,7 +116,10 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="sys-devel/gettext"
-PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+PATCHES=(
+ "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch #
downstream
+ "${WORKDIR}"/${PATCHSET}/${PN}-3.2.1-kross-optional.patch # bug 903532
+)
pkg_pretend() {
check-reqs_pkg_pretend
@@ -152,6 +157,7 @@ src_configure() {
-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale
colorspace
-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON
-DPRODUCTSET="${myproducts[*]}"
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package charts KChart)
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
deleted file mode 100644
index f4efa3d81a..00
--- a/app-office/calligra/files/calligra-3.1.89-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} )
-
[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 7e6a94ada2ab0bca395bb82c499fcbb640568885
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 11 10:16:12 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 11 10:20:48 2018 +
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-.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-.ebuild
b/app-office/calligra/calligra-.ebuild
index c300be6a08..c8bdc8cb76 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.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..00
---
[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: 40297c8d3eaea4cb4b5893a0d648dd91a70cac93
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 31 19:02:13 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 31 20:04:23 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=40297c8d
app-office/calligra: Fix patch new DEPENDs, add USE=gemini
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/calligra/calligra-.ebuild | 45 +-
.../files/calligra-3.0.0-no-arch-detection.patch | 17
.../files/calligra-3.0.90-no-arch-detection.patch | 17
app-office/calligra/metadata.xml | 2 +-
4 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index db53b6af33..8c55ddf184 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -18,11 +18,10 @@ LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular
openexr +pdf
- phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s '
${CAL_FTS[@]})
- $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+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
@@ -30,6 +29,9 @@ IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k
+lcms okular openex
# 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)
@@ -74,6 +76,7 @@ COMMON_DEPEND="
activities? ( $(add_frameworks_dep kactivities) )
crypt? ( app-crypt/qca:2[qt5] )
fontconfig? ( media-libs/fontconfig )
+ gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
gsl? ( sci-libs/gsl )
import-filter? (
$(add_frameworks_dep khtml)
@@ -98,17 +101,14 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libX11
)
- calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
calligra_experimental_features_stage? (
$(add_qt_dep qtwebkit)
okular? ( $(add_kdeapps_dep okular) )
)
- calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
calligra_features_plan? (
$(add_frameworks_dep khtml)
+ $(add_kdeapps_dep kholidays)
dev-libs/kdiagram:5
- =dev-libs/kproperty-3.0*:5
- =dev-libs/kreport-3.0*:5
pim? (
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
@@ -125,7 +125,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
x11-misc/shared-mime-info
test? ( $(add_frameworks_dep threadweaver) )
- vc? ( >=dev-libs/vc-1.1.0 )
"
RDEPEND="${COMMON_DEPEND}
calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
@@ -134,7 +133,7 @@ RDEPEND="${COMMON_DEPEND}
"
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch )
+PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch )
pkg_pretend() {
check-reqs_pkg_pretend
@@ -157,8 +156,7 @@ src_prepare() {
punt_bogus_dep Qt5 Declarative
punt_bogus_dep Qt5 OpenGL
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; then
+ if ! use calligra_experimental_features_stage; then
punt_bogus_dep Qt5 WebKitWidgets
punt_bogus_dep Qt5 WebKit
fi
@@ -176,7 +174,7 @@ src_prepare() {
}
src_configure() {
- local cal_ft myproducts experimental=OFF
+ local cal_ft myproducts
# applications
for cal_ft in ${CAL_FTS[@]}; do
@@ -184,13 +182,10 @@ src_configure() {
myproducts+=( "${cal_ft^^}" )
fi
done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
+
+ [[ ${KDE_BUILD_TYPE} == release ]] && \
+ use calligra_experimental_features_stage && \
+ myproducts+=( CALLIGRA_FEATURES_STAGE )
[gentoo-commits] proj/kde:master commit in: app-office/calligra/files/, app-office/calligra/
commit: ac9329e4a58b6313828519a1efa24cc4f6fcdc3e
Author: Johannes Huber gentoo org>
AuthorDate: Fri Dec 23 08:26:40 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Dec 23 08:26:40 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac9329e4
app-office/calligra: Rename patch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/calligra/calligra-3.0.0.ebuild | 2 +-
app-office/calligra/calligra-.ebuild| 2 +-
...alligra-vc-cxxflags.patch => calligra-3.0.0-no-arch-detection.patch} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/calligra/calligra-3.0.0.ebuild
b/app-office/calligra/calligra-3.0.0.ebuild
index 80da5d8..0bca8c7 100644
--- a/app-office/calligra/calligra-3.0.0.ebuild
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -140,7 +140,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4
"
-PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" )
+PATCHES=( "${FILESDIR}/${P}-no-arch-detection.patch" )
pkg_pretend() {
check-reqs_pkg_pretend
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index 80da5d8..2098cb9 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -140,7 +140,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4
"
-PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-no-arch-detection.patch" )
pkg_pretend() {
check-reqs_pkg_pretend
diff --git a/app-office/calligra/files/calligra-vc-cxxflags.patch
b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
similarity index 100%
rename from app-office/calligra/files/calligra-vc-cxxflags.patch
rename to app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
