diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-03-29 14:58:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-03-29 15:33:44 +0200 |
| commit | a62b5b9c5510874dfd1198f9e17d2b7169155d51 (patch) | |
| tree | 2250489c7fa974e9a0deb53768a8973e169e5849 | |
| parent | 4452c53936e4eb6df13f7b28961b4b4857420c85 (diff) | |
| download | kde-a62b5b9c5510874dfd1198f9e17d2b7169155d51.tar.gz kde-a62b5b9c5510874dfd1198f9e17d2b7169155d51.tar.bz2 kde-a62b5b9c5510874dfd1198f9e17d2b7169155d51.zip | |
app-office/calligra: Switch to patchset, drop KF5Kross dependency
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | app-office/calligra/Manifest | 1 | ||||
| -rw-r--r-- | app-office/calligra/calligra-9999.ebuild | 10 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch | 17 |
3 files changed, 9 insertions, 19 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest new file mode 100644 index 00000000000..c6b7b9add5d --- /dev/null +++ b/app-office/calligra/Manifest @@ -0,0 +1 @@ +DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 8d5898f7f5d..b36dd7f1d27 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 f4efa3d81a4..00000000000 --- 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} ) - |