From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- kde-plasma/bluedevil/Manifest | 5 +- kde-plasma/bluedevil/bluedevil-5.19.1.ebuild | 40 --------------- kde-plasma/bluedevil/bluedevil-5.19.2.ebuild | 44 +++++++++++++++++ ....19.2-use-PlasmaExtras.PlaceholderMessage.patch | 57 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 42 deletions(-) delete mode 100644 kde-plasma/bluedevil/bluedevil-5.19.1.ebuild create mode 100644 kde-plasma/bluedevil/bluedevil-5.19.2.ebuild create mode 100644 kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch (limited to 'kde-plasma/bluedevil') diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index ebee1d83ca46..8cc5c1795b79 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,5 +1,6 @@ +AUX bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 2204 BLAKE2B ec7b389b3bd663f7c4da29c6d4afbc770e6ed2e96c1c6335e1f92b13d05dd77fbcafa508676c27e9759684eaac8087606e8965e8106d55d23427cb63aef1b786 SHA512 a678b1c40cf40659caf3387b028f605d396a03ac08d04b4d74900ce0795208b344942acc1541d3fcd3ef102adc2ded9440f391d4bec501bac5955e108b7fd1e4 DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323 -DIST bluedevil-5.19.1.tar.xz 168712 BLAKE2B c9e97919fef9e7034648df8cd04afbbc98b2f7e8791d01abdea054289e2e79473eb208a7f453351558ef01fa6bc6078bc168e02e82262eb2883ebc3de10ce2b6 SHA512 bcc4e3c8d9ce84e8938fcfba8aeec4a5eca4349a4bf4281445a7614c4a0846779b9faf9be38df6364111c0320f45f7770111bc3b15da908bf895f0f3779b3fd5 +DIST bluedevil-5.19.2.tar.xz 168344 BLAKE2B 9c61edf820366bbc56908d21cf3f8746d75b4718db387886ce5a8a8bebf6dfacf13c8b3a6d4d9ffd168c279afdf955c6b6bc973621372a497682eeea63b4b410 SHA512 827dc9ecc04ee8d385ff2c3eee2e8dce47551cd73ac82c2e8a050c596df2ea2657dcff3632f4bc2c7a1d993d61544ec3e42c307dd9f2bd06032cf265b51ed868 EBUILD bluedevil-5.18.5.ebuild 1068 BLAKE2B f17fc8d025089aac350637564beaae3469673c38b538ffc97af05d20b458cc6a571973bcffd5220c8aeacaf672a8c80eda649f039813a5e0b401a1a6f08f473d SHA512 255d07652fc437a7d1c1569c69d4b27a38162481cde4518694e5768df90bd9dd50e2136ed3769ff0e8a923ae38f20ad1387dcec05e3270ceaceef8471c3e7486 -EBUILD bluedevil-5.19.1.ebuild 1066 BLAKE2B e42e54222cf5005f57b01a0e52bff882638e51cf51fec07091b209f5ac218343c6fa2c81e798cd71abf1cd48aab0a3c6740089a0e7a862da16052569a9325715 SHA512 b4757e370f8185dac9a8872c896adc945d0530d5b9d8d6efddeaf85e527e7cce495fcf17ce4b47675b2944a3bd8f0b601a790e37448b8b424eef7d8b4748243d +EBUILD bluedevil-5.19.2.ebuild 1167 BLAKE2B 9c41b7339e01d851d7d529d6dbaccb0a06390104245b85810109ea458ccf5f17685a865243399183b4404ba714f880e6549027c63507270cd62957b08142e404 SHA512 369a15bc81c3074d7f9dea74646798240ff4eb1283a1b1f6f79043c2f386d12863c89ac2569044981ac578d17742b5dd971b06356fd5226652d250894c3487b0 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/bluedevil/bluedevil-5.19.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.1.ebuild deleted file mode 100644 index 78d78881e450..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.19.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.70.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -inherit ecm kde.org - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://invent.kde.org/plasma/bluedevil" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="" - -DEPEND=" - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild new file mode 100644 index 000000000000..ec72ed866756 --- /dev/null +++ b/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.71.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.14.2 +inherit ecm kde.org + +DESCRIPTION="Bluetooth stack for KDE Plasma" +HOMEPAGE="https://invent.kde.org/plasma/bluedevil" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +DEPEND=" + >=kde-frameworks/bluez-qt-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND="${DEPEND} + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" + +PATCHES=( + "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684 +) diff --git a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch new file mode 100644 index 000000000000..3c41eb2c6942 --- /dev/null +++ b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch @@ -0,0 +1,57 @@ +From 161c1b92bced7996e92026ff9ae503593f6590f6 Mon Sep 17 00:00:00 2001 +From: Nate Graham +Date: Sun, 14 Jun 2020 09:10:38 -0600 +Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage + +The Kirigami version uses QQC2 elements which don't respect the plasma +theme and color scheme, leading to thing slooking out of place +especially when using a dark color theme or scheme. + +Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13 +--- + CMakeLists.txt | 6 ------ + src/applet/package/contents/ui/FullRepresentation.qml | 4 +--- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9067851..5ddce978 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,12 +33,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + find_package(KDED ${KF5_MIN_VERSION} REQUIRED) + find_package(SharedMimeInfo REQUIRED) + +-find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG) +-set_package_properties(KF5Kirigami2 PROPERTIES +- DESCRIPTION "A QtQuick based components set" +- TYPE RUNTIME +-) +- + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings NO_POLICY_SCOPE) +diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml +index 5bd32f15..e77bf295 100644 +--- a/src/applet/package/contents/ui/FullRepresentation.qml ++++ b/src/applet/package/contents/ui/FullRepresentation.qml +@@ -27,8 +27,6 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.components 3.0 as PlasmaComponents3 + import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt + +-import org.kde.kirigami 2.12 as Kirigami +- + PlasmaComponents3.Page { + + Action { +@@ -99,7 +97,7 @@ PlasmaComponents3.Page { + // Not inside the ListView because we want the listview to be hidden + // when Bluetooth is disabled, yet still show an "Enable Bluetooth" + // message +- Kirigami.PlaceholderMessage { ++ PlasmaExtras.PlaceholderMessage { + anchors.centerIn: parent + anchors.left: parent.left + anchors.right: parent.right +-- +2.27.0 + -- cgit v1.2.3