pool/bluedevil5
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 840971 from KDE:Frameworks5

Browse Source 
Plasma 5.20.0

OBS-URL: https://build.opensuse.org/request/show/840971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluedevil5?expand=0&rev=99
This commit is contained in:
Dominique Leuenberger
2020-10-13 13:27:31 +00:00
committed by Git OBS Bridge
parent 9c30432669 a46d882e68
commit d29bbf1081
7 changed files with 80 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
0001-Port-applet-to-use-PlasmaExtras.PlaceholderMessage.patch
View File

@@ -1,57 +0,0 @@
From b600030a29058f7bfefedae7ea317f951603dd73 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
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 55295aef..eeb96f53 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.25.1

3
bluedevil-5.19.5.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e857e3c73a3d6c08bb44506f35a8359b480e960d32ae189b9b5bddcbcf5ffe2d
size 168480

11
bluedevil-5.19.5.tar.xz.sig
View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9OIIsACgkQ7JTRj38F
mX58oAf+PCXm3hFw0mN6mAn6aKOutXwZUV/pxCpJX0hG5kLYpsvppzvfW21RZuN5
EMVytnL7Wv0EjiEUH4ywlYF/whlIHJGcjhaRePTAyj5aJ56W9Jb/j35WNWtLxbpt
UhsVBkAp1PfhYxK0HtMIfbiDPW/9NtKwUIPiRDdEVqoplynhLOLzljjoBQrFaJy7
RN8YRZBHGI81yJlSX3/d1CZHh+TZDadjhWgHCe+uKsVznU32OoRE5EsfEr1RdG5j
FwWVZ0oCtHCr0Z991eL1/fGhYNfssui3hlg/ivi4iS1iutr4S+acUbv55VsGZiZR
pDoKUlNiwFnagatoNjn3Az+z2jnOsQ==
=YcAO
-----END PGP SIGNATURE-----

3
bluedevil-5.20.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67285a99af29fa121657f3ad3f6a17a22d56190414a40341e7948a097228804f
size 154604

11
bluedevil-5.20.0.tar.xz.sig Normal file
View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/OIUACgkQ7JTRj38F
mX6aBQf+I9S0c06o7lpOAnwk7gbIQU0PUrex+u421x9t1WCDBRSxW203MJZ2B9tw
zQ72Uqrt40Zv81x0YuVDKPIbm+CUYtPh9FnGzNLcSxBBlkY8YHpOcmCV53Mz2149
UCQ0fbI2B0M71/tjRgMkrRpPTCEuzEQze9j21V40lnSRaoEg0La/z1TVa569SFZH
W7Dro+4ybBe00/GY0jxPYTGHsKqL2s8XDsSgrRuo9rrKCliC6VmGKWyv32vOOFED
AaMzEPu9TlhqXGW8zHpG+Fj0FlA72MVylSWy57TqdwDiwKpnb9hpqlFQavhEd8qQ
zJ8bES3k6s+8+ll94uCJ8lludTaDvw==
=2zUY
-----END PGP SIGNATURE-----

42
bluedevil5.changes
View File

@@ -1,3 +1,45 @@
-------------------------------------------------------------------
Thu Oct 8 16:55:19 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.20.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma-5.20.0
- Changes since 5.19.90:
* [applet] Open new KCM from the configure action
* Add Exec line to KCM desktop file
-------------------------------------------------------------------
Thu Sep 17 20:02:55 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.19.90
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma-5.19.90
- Changes since 5.19.5:
* Remove explicit ECM_KDE_MODULE_DIR
* Convert copyright statements to SPDX expressions
* bluedevil-sendfile: Fix small size of file selector
* Fix minor typo
* Translate KCM (patch by Victor Ryzhykh)
* Fix a TypeError in DeviceItem.qml
* New bluetooth KCM
* [wizard] Enable 1-finger touch scrolling (kde#406544)
* [applet] Don't show emblem for disconnected devices (kde#425239)
* [applet] Port to checkbox with internally-defined icon property
* set a name for the global notification category
* [applet] Port mostly to PlasmaComponents3
* correct appstream homepage URL to plasma homepage
* Increase frameworks dependency to 5.72 for PlasmaExtras.PlaceholderMessage
* Port applet to use PlasmaExtras.PlaceholderMessage
* [applet] Fix tooltip showing wrong name for connected device (kde#422691)
-------------------------------------------------------------------
Thu Sep 17 19:19:15 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Drop patches, now upstream:
* 0001-Port-applet-to-use-PlasmaExtras.PlaceholderMessage.patch
-------------------------------------------------------------------
Tue Sep 1 11:38:47 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

47
bluedevil5.spec
View File

@@ -19,37 +19,36 @@
%bcond_without lang
Name: bluedevil5
Version: 5.19.5
Version: 5.20.0
Release: 0
Summary: Bluetooth Manager for KDE Plasma
License: GPL-2.0-or-later
Group: Hardware/Other
URL: http://www.kde.org/
Source: https://download.kde.org/stable/plasma/%{version}/bluedevil-%{version}.tar.xz
Source: bluedevil-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/bluedevil-%{version}.tar.xz.sig
Source1: bluedevil-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Port-applet-to-use-PlasmaExtras.PlaceholderMessage.patch
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
BuildRequires: shared-mime-info
BuildRequires: cmake(KDED) >= 5.25.0
BuildRequires: cmake(KF5BluezQt) >= 5.25.0
BuildRequires: cmake(KF5CoreAddons) >= 5.25.0
BuildRequires: cmake(KF5DBusAddons) >= 5.25.0
BuildRequires: cmake(KF5I18n) >= 5.25.0
BuildRequires: cmake(KF5IconThemes) >= 5.25.0
BuildRequires: cmake(KF5KIO) >= 5.25.0
BuildRequires: cmake(KF5Notifications) >= 5.25.0
BuildRequires: cmake(KF5Plasma) >= 5.25.0
BuildRequires: cmake(KF5WidgetsAddons) >= 5.25.0
BuildRequires: cmake(KF5WindowSystem) >= 5.25.0
BuildRequires: cmake(Qt5Core) >= 5.4.0
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Qml) >= 5.4.0
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
BuildRequires: cmake(KDED) >= 5.72.0
BuildRequires: cmake(KF5BluezQt)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5Declarative)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5Plasma)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(Qt5Core) >= 5.15.0
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Qml)
BuildRequires: cmake(Qt5Widgets)
Requires: bluez-qt-imports >= %{version}
Requires: bluez-qt-udev >= %{version}
# atop of the bluez itself, we also need bluez-obexd for kio_obexftp and both send/receive
@@ -66,9 +65,8 @@ Requires(postun): shared-mime-info
Bluetooth daemon for KDE Plasma, handling connections.
%lang_package
%prep
%autosetup -p1 -n bluedevil-%{version}
%setup -q -n bluedevil-%{version}
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@@ -87,9 +85,12 @@ Bluetooth daemon for KDE Plasma, handling connections.
%mime_database_postun
%files
%license COPYING*
%license LICENSES/*
%doc README
%dir %{_kf5_appstreamdir}/
%dir %{_kf5_sharedir}/kpackage
%dir %{_kf5_sharedir}/kpackage/kcms
%{_kf5_sharedir}/kpackage/kcms/kcm_bluetooth/
%{_kf5_sharedir}/mime/packages/bluedevil-mime.xml
%{_kf5_applicationsdir}/org.kde.bluedevil*.desktop
%{_kf5_sharedir}/bluedevilwizard/