From 73df8a031aa1e97bdb0086308f04d42a8dd29479 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 12 Jun 2020 18:36:01 +0200 Subject: [PATCH] temp/plasma-workspace: drop, newer version is in Alpine Cherry-picked by ollieparanoid from MR 1235, because temp/plasma-workspace has outdated dependencies that make the upstream-compatibility test fail. --- temp/plasma-workspace/APKBUILD | 41 ------------------- temp/plasma-workspace/D27968.patch | 24 ----------- .../language-kcm-wrap-label-text.patch | 41 ------------------- 3 files changed, 106 deletions(-) delete mode 100644 temp/plasma-workspace/APKBUILD delete mode 100644 temp/plasma-workspace/D27968.patch delete mode 100644 temp/plasma-workspace/language-kcm-wrap-label-text.patch diff --git a/temp/plasma-workspace/APKBUILD b/temp/plasma-workspace/APKBUILD deleted file mode 100644 index ebb64a697..000000000 --- a/temp/plasma-workspace/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Forked to apply Plasma Mobile specific fixes that are not in a release yet -pkgname=plasma-workspace -pkgver=5.18.80 -_pkgver=5.18.3 -pkgrel=2 -pkgdesc="KDE Plasma Workspace" -arch="all !armhf" # armhf blocked by kirigami2 -> qt5-qtdeclarative -url="https://www.kde.org/workspaces/plasmadesktop/" -license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-or-later AND MIT AND LGPL-2.1-only AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only" -depends="tzdata qt5-qtquickcontrols kirigami2 kinit qt5-qttools kwin kactivitymanagerd milou plasma-integration qtchooser kded kquickcharts" -depends_dev="plasma-framework-dev krunner-dev kjsembed-dev knotifyconfig-dev kdesu-dev knewstuff-dev kwallet-dev kidletime-dev kdeclarative-dev ki18n-dev kcmutils-dev ktextwidgets-dev kdelibs4support-dev kcrash-dev kglobalaccel-dev kdbusaddons-dev kwayland-dev kcoreaddons-dev kded-dev libksysguard-dev kpackage-dev kscreenlocker-dev phonon-dev zlib-dev kitemmodels-dev networkmanager-qt-dev baloo-dev ktexteditor-dev kwin-dev kholidays-dev prison-dev kpeople-dev kactivities-stats-dev libkscreen-dev gpsd-dev iso-codes-dev" -makedepends="$depends_dev extra-cmake-modules kdoctools-dev libxtst-dev" -checkdepends="xvfb-run" -source="https://download.kde.org/stable/plasma/$_pkgver/plasma-workspace-$_pkgver.tar.xz - language-kcm-wrap-label-text.patch - D27968.patch - " -subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang" -builddir="$srcdir/$pkgname-$_pkgver" - -build() { - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - make -C build -} - -check() { - cd "$builddir"/build - # nightcolortest requires running dbus - # testdesktop is broken - CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest -E "(nightcolortest|testdesktop)" -} - -package() { - DESTDIR="$pkgdir" make -C build install -} -sha512sums="a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e plasma-workspace-5.18.3.tar.xz -5628f61e702d332cbb87b8221a2b71e80bca1789026b82e74b1eaaa0a2f8438a705aac5ec99888239390753c81ec6a036acbf9ffad800987f08953cf6631adfe language-kcm-wrap-label-text.patch -25aac2b2d8e10397e0eca2e79acb61785c48b316c3c6977d6258f33a1a05f47ea6de7c749b3cf8316c919ef67050bce379c8415addbd29695f8f3f4c35f22bd0 D27968.patch" diff --git a/temp/plasma-workspace/D27968.patch b/temp/plasma-workspace/D27968.patch deleted file mode 100644 index 441c6ed7e..000000000 --- a/temp/plasma-workspace/D27968.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/applets/notifications/package/contents/ui/global/Globals.qml b/applets/notifications/package/contents/ui/global/Globals.qml ---- a/applets/notifications/package/contents/ui/global/Globals.qml -+++ b/applets/notifications/package/contents/ui/global/Globals.qml -@@ -26,6 +26,7 @@ - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.kquickcontrolsaddons 2.0 -+import org.kde.kirigami 2.11 as Kirigami - - import org.kde.notificationmanager 1.0 as NotificationManager - import org.kde.taskmanager 0.1 as TaskManager -@@ -90,6 +91,11 @@ - property var plasmoids: [] - - property int popupLocation: { -+ // if we are on mobile, we can ignore the settings totally and just -+ // align it to top left -+ if (Kirigami.Settings.isMobile) { -+ return Qt.AlignTop | Qt.AlignHCenter; -+ } - switch (notificationSettings.popupPosition) { - // Auto-determine location based on plasmoid location - case NotificationManager.Settings.CloseToWidget: - diff --git a/temp/plasma-workspace/language-kcm-wrap-label-text.patch b/temp/plasma-workspace/language-kcm-wrap-label-text.patch deleted file mode 100644 index ac8802a2a..000000000 --- a/temp/plasma-workspace/language-kcm-wrap-label-text.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b2df03a51f979066e6b0211dfd4986c2d1820089 Mon Sep 17 00:00:00 2001 -From: Bart Ribbers -Date: Mon, 2 Mar 2020 14:10:53 +0100 -Subject: [Language KCM] Wrap the label text - -Summary: -This way the text doesn't get cut off the screen on at least the -PinePhone - -Test Plan: -1. Open the Language KCM on a small screen without this patch -2. Open the Language KCM on a small screen with this patch - -Reviewers: davidedmundson - -Reviewed By: davidedmundson - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D27781 ---- - kcms/translations/package/contents/ui/main.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kcms/translations/package/contents/ui/main.qml b/kcms/translations/package/contents/ui/main.qml -index 24054ab..9e9d999 100644 ---- a/kcms/translations/package/contents/ui/main.qml -+++ b/kcms/translations/package/contents/ui/main.qml -@@ -171,6 +171,7 @@ ScrollViewKCM { - visible: languagesList.count - - text: i18n("The language at the top of this list is the one you want to see and use most often.") -+ wrapMode: Text.WordWrap - } - } - --- -cgit v1.1 -