| 1 |
commit: 47ca95559c134e6f65ef466d0c944a5c98d76354 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 1 06:28:10 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 1 06:43:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ca9555 |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: 5.22.90 version bump |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
kde-plasma/plasma-desktop/Manifest | 1 + |
| 13 |
.../plasma-desktop/plasma-desktop-5.22.90.ebuild | 186 +++++++++++++++++++++ |
| 14 |
2 files changed, 187 insertions(+) |
| 15 |
|
| 16 |
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest |
| 17 |
index aabf02266db..c8f618501c0 100644 |
| 18 |
--- a/kde-plasma/plasma-desktop/Manifest |
| 19 |
+++ b/kde-plasma/plasma-desktop/Manifest |
| 20 |
@@ -1,2 +1,3 @@ |
| 21 |
DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac |
| 22 |
+DIST plasma-desktop-5.22.90.tar.xz 15770628 BLAKE2B 473dbd7c77a79d8c626df737a3d80760cd086d301f0f4e8485634eb17a0b30334b5b6b0c0e0aed29e10fa7f2cf0d07e8e125c0eaa0e61be27343ea668fb92309 SHA512 7942075cfb1b6d9457bbe986b1300fd2aa004dffea703f648125fb63a171f085d1537d1e12a2d33203690b47b0a61e0dee5c78ccb03fe4c706edc74ef6b0ff8b |
| 23 |
DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20 |
| 24 |
|
| 25 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild |
| 26 |
new file mode 100644 |
| 27 |
index 00000000000..1de5918b598 |
| 28 |
--- /dev/null |
| 29 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild |
| 30 |
@@ -0,0 +1,186 @@ |
| 31 |
+# Copyright 1999-2021 Gentoo Authors |
| 32 |
+# Distributed under the terms of the GNU General Public License v2 |
| 33 |
+ |
| 34 |
+EAPI=8 |
| 35 |
+ |
| 36 |
+ECM_HANDBOOK="forceoptional" |
| 37 |
+ECM_TEST="true" |
| 38 |
+KFMIN=5.86.0 |
| 39 |
+PVCUT=$(ver_cut 1-3) |
| 40 |
+QTMIN=5.15.2 |
| 41 |
+VIRTUALX_REQUIRED="test" |
| 42 |
+inherit ecm kde.org optfeature |
| 43 |
+ |
| 44 |
+DESCRIPTION="KDE Plasma desktop" |
| 45 |
+XORGHDRS="${PN}-override-include-dirs-1" |
| 46 |
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
| 47 |
+ |
| 48 |
+LICENSE="GPL-2" # TODO: CHECK |
| 49 |
+SLOT="5" |
| 50 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
| 51 |
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry" |
| 52 |
+ |
| 53 |
+COMMON_DEPEND=" |
| 54 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 55 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
| 56 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
| 57 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
| 58 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
| 59 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 60 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
| 61 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 62 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 63 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 64 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
| 65 |
+ >=kde-frameworks/attica-${KFMIN}:5 |
| 66 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
| 67 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
| 68 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
| 69 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
| 70 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 71 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
| 72 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
| 73 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
| 74 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
| 75 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 76 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 77 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
| 78 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
| 79 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
| 80 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
| 81 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
| 82 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
| 83 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 84 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
| 85 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 86 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
| 87 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
| 88 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
| 89 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 90 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
| 91 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
| 92 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 93 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
| 94 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
| 95 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
| 96 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 97 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 98 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 99 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
| 100 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
| 101 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
| 102 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
| 103 |
+ >=kde-plasma/libksysguard-${PVCUT}:5 |
| 104 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
| 105 |
+ >=kde-plasma/plasma-workspace-${PVCUT}:5 |
| 106 |
+ >=media-libs/phonon-4.11.0 |
| 107 |
+ virtual/libcrypt:= |
| 108 |
+ x11-libs/libX11 |
| 109 |
+ x11-libs/libXfixes |
| 110 |
+ x11-libs/libXi |
| 111 |
+ x11-libs/libxcb[xkb] |
| 112 |
+ x11-libs/libxkbfile |
| 113 |
+ emoji? ( |
| 114 |
+ app-i18n/ibus[emoji] |
| 115 |
+ dev-libs/glib:2 |
| 116 |
+ media-fonts/noto-emoji |
| 117 |
+ ) |
| 118 |
+ ibus? ( |
| 119 |
+ app-i18n/ibus |
| 120 |
+ dev-libs/glib:2 |
| 121 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 122 |
+ x11-libs/libxcb |
| 123 |
+ x11-libs/xcb-util-keysyms |
| 124 |
+ ) |
| 125 |
+ kaccounts? ( |
| 126 |
+ kde-apps/kaccounts-integration:5 |
| 127 |
+ net-libs/accounts-qt |
| 128 |
+ ) |
| 129 |
+ policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) |
| 130 |
+ scim? ( app-i18n/scim ) |
| 131 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
| 132 |
+ telemetry? ( dev-libs/kuserfeedback:5 ) |
| 133 |
+" |
| 134 |
+DEPEND="${COMMON_DEPEND} |
| 135 |
+ dev-libs/boost |
| 136 |
+ x11-base/xorg-proto |
| 137 |
+" |
| 138 |
+RDEPEND="${COMMON_DEPEND} |
| 139 |
+ !kde-plasma/user-manager |
| 140 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
| 141 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 142 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
| 143 |
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
| 144 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 145 |
+ >=kde-plasma/oxygen-${PVCUT}:5 |
| 146 |
+ sys-apps/util-linux |
| 147 |
+ x11-apps/setxkbmap |
| 148 |
+ x11-misc/xdg-user-dirs |
| 149 |
+ kaccounts? ( net-libs/signon-oauth2 ) |
| 150 |
+ policykit? ( sys-apps/accountsservice ) |
| 151 |
+" |
| 152 |
+BDEPEND="virtual/pkgconfig" |
| 153 |
+ |
| 154 |
+PATCHES=( |
| 155 |
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch |
| 156 |
+) |
| 157 |
+ |
| 158 |
+src_prepare() { |
| 159 |
+ ecm_src_prepare |
| 160 |
+ |
| 161 |
+ if ! use policykit; then |
| 162 |
+ ecm_punt_bogus_dep KF5 Wallet |
| 163 |
+ cmake_run_in kcms cmake_comment_add_subdirectory users |
| 164 |
+ fi |
| 165 |
+ |
| 166 |
+ if ! use ibus; then |
| 167 |
+ sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
| 168 |
+ -i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
| 169 |
+ fi |
| 170 |
+ |
| 171 |
+ use emoji || cmake_run_in applets/kimpanel/backend/ibus \ |
| 172 |
+ cmake_comment_add_subdirectory emojier |
| 173 |
+ |
| 174 |
+ # TODO: try to get a build switch upstreamed |
| 175 |
+ if ! use scim; then |
| 176 |
+ sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die |
| 177 |
+ fi |
| 178 |
+} |
| 179 |
+ |
| 180 |
+src_configure() { |
| 181 |
+ local mycmakeargs=( |
| 182 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged |
| 183 |
+ -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 184 |
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 185 |
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 186 |
+ -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 187 |
+ $(cmake_use_find_package kaccounts AccountsQt5) |
| 188 |
+ $(cmake_use_find_package kaccounts KAccounts) |
| 189 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
| 190 |
+ $(cmake_use_find_package telemetry KUserFeedback) |
| 191 |
+ ) |
| 192 |
+ if ! use emoji && ! use ibus; then |
| 193 |
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) |
| 194 |
+ fi |
| 195 |
+ |
| 196 |
+ ecm_src_configure |
| 197 |
+} |
| 198 |
+ |
| 199 |
+src_test() { |
| 200 |
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
| 201 |
+ # test_kio_fonts needs D-Bus, bug #634166 |
| 202 |
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918 |
| 203 |
+ local myctestargs=( |
| 204 |
+ -j1 |
| 205 |
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" |
| 206 |
+ ) |
| 207 |
+ |
| 208 |
+ ecm_src_test |
| 209 |
+} |
| 210 |
+ |
| 211 |
+pkg_postinst() { |
| 212 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 213 |
+ optfeature "screen reader support" app-accessibility/orca |
| 214 |
+ fi |
| 215 |
+ ecm_pkg_postinst |
| 216 |
+} |
Archives