commit: a62b5b9c5510874dfd1198f9e17d2b7169155d51
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 12:58:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 13:33:44 2023 +0000
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 <asturm <AT> gentoo.org>
app-office/calligra/calligra-9999.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-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 8d5898f7f5..b36dd7f1d2 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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..0000000000
--- 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} )
-
