Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kcalutils/, kde-apps/kcalutils/files/
Date: Tue, 26 Apr 2022 21:57:14
Message-Id: 1651010148.d963538dfba521c832dbb1443cccd551480aba74.sam@gentoo
1 commit: d963538dfba521c832dbb1443cccd551480aba74
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 21:55:48 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 21:55:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d963538d
7
8 kde-apps/kcalutils: backport installation path fix
9
10 Backports upstream commit 494331a28bb722b4ab4c38a2520f305b8f7ad8fa.
11
12 See: https://mail.kde.org/pipermail/distributions/2022-April/001223.html
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../kcalutils-22.04.0-kmail-calendar-invites.patch | 29 +++++++++++++++
16 kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild | 42 ++++++++++++++++++++++
17 2 files changed, 71 insertions(+)
18
19 diff --git a/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch b/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch
20 new file mode 100644
21 index 000000000000..56ac25b3d451
22 --- /dev/null
23 +++ b/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch
24 @@ -0,0 +1,29 @@
25 +https://mail.kde.org/pipermail/distributions/2022-April/001223.html
26 +https://invent.kde.org/pim/kcalutils/-/commit/494331a28bb722b4ab4c38a2520f305b8f7ad8fa
27 +
28 +From 494331a28bb722b4ab4c38a2520f305b8f7ad8fa Mon Sep 17 00:00:00 2001
29 +From: Laurent Montel <montel@×××.org>
30 +Date: Fri, 22 Apr 2022 19:06:36 +0200
31 +Subject: [PATCH] Fix Bug 452480: Kmail doesn't display calendar invites
32 +
33 +BUG:452480
34 +FIXED-IN: 5.17.1
35 +--- a/src/grantlee_plugin/CMakeLists.txt
36 ++++ b/src/grantlee_plugin/CMakeLists.txt
37 +@@ -21,6 +21,12 @@ target_link_libraries(kcalendar_grantlee_plugin
38 + KF5CalendarUtils
39 + )
40 +
41 +-install(TARGETS kcalendar_grantlee_plugin
42 +- LIBRARY DESTINATION ${LIB_INSTALL_DIR}/KTextTemplate/${KTextTemplate_MAJOR_MINOR_VERSION_STRING}/
43 +-)
44 ++if (QT_MAJOR_VERSION STREQUAL "5")
45 ++ install(TARGETS kcalendar_grantlee_plugin
46 ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}/
47 ++ )
48 ++else()
49 ++ install(TARGETS kcalendar_grantlee_plugin
50 ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/KTextTemplate/${KTextTemplate_MAJOR_MINOR_VERSION_STRING}/
51 ++ )
52 ++endif()
53 +GitLab
54
55 diff --git a/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild b/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild
56 new file mode 100644
57 index 000000000000..25a4d5234e2d
58 --- /dev/null
59 +++ b/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild
60 @@ -0,0 +1,42 @@
61 +# Copyright 1999-2022 Gentoo Authors
62 +# Distributed under the terms of the GNU General Public License v2
63 +
64 +EAPI=8
65 +
66 +ECM_QTHELP="true"
67 +ECM_TEST="true"
68 +PVCUT=$(ver_cut 1-3)
69 +KFMIN=5.92.0
70 +QTMIN=5.15.2
71 +VIRTUALX_REQUIRED="test"
72 +inherit ecm kde.org
73 +
74 +DESCRIPTION="Library providing utility functions for the handling of calendar data"
75 +HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
76 +
77 +LICENSE="GPL-2+ LGPL-2.1+"
78 +SLOT="5"
79 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
80 +IUSE=""
81 +
82 +RESTRICT="test" # bugs 653616, 711666
83 +
84 +DEPEND="
85 + >=dev-libs/grantlee-5.2.0:5
86 + >=dev-qt/qtgui-${QTMIN}:5
87 + >=dev-qt/qtwidgets-${QTMIN}:5
88 + >=kde-apps/kidentitymanagement-${PVCUT}:5
89 + >=kde-frameworks/kcalendarcore-${KFMIN}:5
90 + >=kde-frameworks/kcodecs-${KFMIN}:5
91 + >=kde-frameworks/kconfig-${KFMIN}:5
92 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5
93 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
94 + >=kde-frameworks/ki18n-${KFMIN}:5
95 + >=kde-frameworks/kiconthemes-${KFMIN}:5
96 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
97 +"
98 +RDEPEND="${DEPEND}"
99 +
100 +PATCHES=(
101 + "${FILESDIR}"/${P}-kmail-calendar-invites.patch
102 +)