packages/ukui-bluetooth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to 1.0.2

Browse Source 
(cherry picked from commit a6c9fe86bd2c4c6fe5fef260e3a320c15c6f0657)
This commit is contained in:
peijiankang 2022-06-21 10:14:15 +08:00 committed by openeuler-sync-bot
parent 4ce21f820c
commit 1df8c27e1a
12 changed files with 18 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-fix-Bluetooth-pulled-up-by-the-session-manager-and-exits-abnormally.patch
View File

@ -1,48 +0,0 @@
From 5163effc944fb312888b84ec6033c0ab19d4197a Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 29 Oct 2021 15:26:14 +0800
Subject: [PATCH] fix Bluetooth pulled up by the session manager and exits
abnormally
---
debian/control | 2 +-
ukui-bluetooth/main/featureswidget.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index ca3fd8e..4f12e6c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
libxinerama-dev,
libxi-dev,
libxcursor-dev,
- libukui-log4qt-dev
+# libukui-log4qt-dev
# libkf5bluezqt6-dev
Standards-Version: 4.4.1
Homepage: https://github.com/supreme886/ukui-bluetooth
diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
index bec6773..300f51f 100644
--- a/ukui-bluetooth/main/featureswidget.cpp
+++ b/ukui-bluetooth/main/featureswidget.cpp
@@ -610,6 +610,7 @@ void FeaturesWidget::Turn_on_or_off_bluetooth(bool f)
if(p->error() == 0){
flag = true;
qDebug() << Q_FUNC_INFO << m_adapter->isPowered();
+ m_manager->setBluetoothBlocked(true);
// Connect_the_last_connected_device();
}else
qDebug() << "Failed to turn off Bluetooth:" << p->errorText();
@@ -894,7 +895,7 @@ void FeaturesWidget::adapterPoweredChanged(bool value)
if (value == true) {//开启
bluetooth_tray_icon->setIcon(QIcon::fromTheme("bluetooth-active-symbolic"));
bluetooth_tray_icon->show();
- Connect_the_last_connected_device();
+ //Connect_the_last_connected_device();
}else {//关闭
if(QIcon::hasThemeIcon("bluetooth-error"))
bluetooth_tray_icon->setIcon(QIcon::fromTheme("bluetooth-error"));
--
2.30.0

25
0002-fix-ukui-bluetooth-will-have-a-segfault-when-times-out.patch
View File

@ -1,25 +0,0 @@
From 20277829b38feb83ec7da521c9e9a581f710931c Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Sat, 30 Oct 2021 16:50:00 +0800
Subject: [PATCH] fix ukui-bluetooth will have a segfault
---
ukui-bluetooth/agent/bluetoothagent.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/ukui-bluetooth/agent/bluetoothagent.cpp b/ukui-bluetooth/agent/bluetoothagent.cpp
index 842c275..067d910 100644
--- a/ukui-bluetooth/agent/bluetoothagent.cpp
+++ b/ukui-bluetooth/agent/bluetoothagent.cpp
@@ -123,8 +123,6 @@ void BluetoothAgent::requestConfirmation(BluezQt::DevicePtr device, const QStrin
connect(m_device.data(), &BluezQt::Device::pairedChanged, this, [=](bool st){
if (st == false) {
request.reject();
- if (pincodewidget != nullptr)
- pincodewidget->close();
}
return;
});
--
2.30.0

45
0003-fix-restart-the-system-Bluetooth-core-dump.patch
View File

@ -1,45 +0,0 @@
From e62a6729d4457b7e77fa4968e045866c16e24a6d Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 10:32:54 +0800
Subject: [PATCH] fix restart the system Bluetooth core dump
---
ukui-bluetooth/main/featureswidget.cpp | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
index 300f51f..ff3f623 100644
--- a/ukui-bluetooth/main/featureswidget.cpp
+++ b/ukui-bluetooth/main/featureswidget.cpp
@@ -86,14 +86,21 @@ FeaturesWidget::FeaturesWidget(QWidget *parent)
qDebug() << m_manager->registerAgent(bluetoothAgent)->errorText();
qDebug() << m_adapter->isPowered() << "===========" << m_manager->isBluetoothBlocked();
- if(settings->get("switch").toString() == "false"){
- if (!m_manager->isBluetoothBlocked())
- m_manager->setBluetoothBlocked(true);
- }else{
- if(m_manager->isBluetoothBlocked()){
- m_manager->setBluetoothBlocked(false);
- }
+// if(settings->get("switch").toString() == "false"){
+// if (!m_manager->isBluetoothBlocked())
+// m_manager->setBluetoothBlocked(true);
+// }else{
+// if(m_manager->isBluetoothBlocked()){
+// m_manager->setBluetoothBlocked(false);
+// }
+// }
+
+ bool value;
+ if(value != settings->get("switch").toBool()){
+ Turn_on_or_off_bluetooth(value);
}
+ if (value = settings->get("switch").toBool() )
+
if(File_save_path.isEmpty()){
settings->set("file-save-path",QVariant::fromValue(QDir::homePath()));
--
2.30.0

30
0004-fix-repair-bug.patch
View File

@ -1,30 +0,0 @@
From 1eed1d15318d93969903cf03ada0dec6633c6f43 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 10:40:37 +0800
Subject: [PATCH] fix repair bug
---
ukui-bluetooth/main/featureswidget.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
index ff3f623..171506e 100644
--- a/ukui-bluetooth/main/featureswidget.cpp
+++ b/ukui-bluetooth/main/featureswidget.cpp
@@ -95,12 +95,7 @@ FeaturesWidget::FeaturesWidget(QWidget *parent)
// }
// }
- bool value;
- if(value != settings->get("switch").toBool()){
- Turn_on_or_off_bluetooth(value);
- }
- if (value = settings->get("switch").toBool() )
-
+ Turn_on_or_off_bluetooth(settings->get("switch").toBool());
if(File_save_path.isEmpty()){
settings->set("file-save-path",QVariant::fromValue(QDir::homePath()));
--
2.30.0

25
0005-fix-control-files.patch
View File

@ -1,25 +0,0 @@
From c2dd7b21afd60a8f30520f3724ae1c3d4d8aeda2 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 16 Nov 2021 16:12:18 +0800
Subject: [PATCH] fix control files
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 4f12e6c..c7447ea 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: libkf5bluezqt6,
libnotify-bin,
bluez (>= 5),
bluez-obexd,
- peony-bluetooth (>= 3.2.2),
+ peony-extensions (>= 3.2.2+0611),
${shlibs:Depends}, ${misc:Depends}
Recommends: pulseaudio-module-bluetooth
Conflicts: blueman
--
2.30.0

32
0006-Update-changelog-and-format.patch
View File

@ -1,32 +0,0 @@
From 06dff81a70eea70f970f642fd2f01954ae86198b Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 2 Dec 2021 10:33:15 +0800
Subject: [PATCH] Update changelog and format
---
debian/changelog | 4 ++++
debian/source/format | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 32d6aff..9e72d1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+ukui-bluetooth (1.0.1-1~0820) focal; urgency=medium
+
+ * New upstream release.
+
ukui-bluetooth (1.0.0-49+0612) focal; urgency=medium
* Build for Ubuntukylin
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
--
2.30.0

31
0007-Update-Debian-changelog-info.patch
View File

@ -1,31 +0,0 @@
From 5aa5335b84bfb9a40b52894aa13b4103f0ca1725 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 3 Dec 2021 10:10:17 +0800
Subject: [PATCH] Update Debian changelog info
---
debian/changelog | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9e72d1d..151f11b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ukui-bluetooth (1.0.0-1kylin1k53) v101; urgency=medium
+ * Bug :
+ - bug#63674
+ 手机与系统蓝牙配对超时后，1分钟之后点击确认，ukui-bluetooth会出现段错误(lixiang)
+ - bug#63675
+ 手机与系统蓝牙配对，点击取消配对后，手机的蓝牙未从配对列表移除(lixiang)
+ * Task :
+ * Other:
+
+ -- guang tang <tangguang@kylinos.cn> Wed, 30 Jun 2021 08:37:51 +0800
+
ukui-bluetooth (1.0.1-1~0820) focal; urgency=medium
* New upstream release.
--
2.30.0

60
0008-add-and-update-chanageinfo.patch
View File

@ -1,60 +0,0 @@
From 0102c5b32dc62c5ede7b1f10445cec1e5bd8351e Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 7 Dec 2021 14:32:24 +0800
Subject: [PATCH] add and update chanageinfo
---
debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 151f11b..21ebb37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+ukui-bluetooth (1.0.0-1kylin1k59) v101; urgency=medium
+
+ * Bug :
+ - bug#65530/65567 蓝牙配对成功后，通知中弹出两条同样的信息
+ - bug#65558 蓝牙传输文件不弹文件接收窗口
+ - bug#65770/65763
+ 蓝牙传输文件后不关闭蓝牙文件传输成功的界面；直接再次通过蓝牙传输文件失败
+ * Task :
+ * Other:
+
+ -- guang tang <tangguang@kylinos.cn> Thu, 08 Jul 2021 16:15:15 +0800
+
+ukui-bluetooth (1.0.0-1kylin1k58) v101; urgency=medium
+
+ * Bug :
+ - bug#63109 控制面板、托盘处蓝牙的状态与任务栏显示的状态不一致
+ * Task :
+ * Other:
+ - 解决重启蓝牙服务后连接设备不弹框问题
+ - 解决重启蓝牙服务后agent断开问题
+
+ -- guang tang <tangguang@kylinos.cn> Wed, 07 Jul 2021 15:05:26 +0800
+
+ukui-bluetooth (1.0.0-1kylin1k57) v101; urgency=medium
+
+ * Bug :
+ * Task :
+ * Other:
+ - Rebuild
+
+ -- guang tang <tangguang@kylinos.cn> Wed, 07 Jul 2021 11:22:52 +0800
+
+ukui-bluetooth (1.0.0-1kylin1k56) v101; urgency=medium
+
+ * Bug :
+ - bug#63109 控制面板、托盘处蓝牙的状态与任务栏显示的状态不一致
+ - bug#62739 【cpm】【L1】9：01：40左右蓝牙传输文件不弹文件接收窗口
+ - bug#65064 蓝牙配对成功后，通知中弹出两条同样的信息
+ - bug#64471 蓝牙设备连接成功后出现两条连接成功消息
+ - bug#62724 蓝牙文件接收过程中取消，多次弹出确认窗口
ukui-bluetooth (1.0.0-1kylin1k53) v101; urgency=medium
* Bug :
- bug#63674
--
2.30.0

20
0009-Update-README-info.patch
View File

@ -1,20 +0,0 @@
From bd9905a8a198682370fdde84dc1e06777aec7dc4 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Wed, 8 Dec 2021 17:45:13 +0800
Subject: [PATCH] Update README info
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d8cc9a1..2dc988f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
# UKUI-Bluetooth
-## Simple bluetooth tool for ukui desktop environment
+## Simple bluetooth tool for ukui desktop environment# UKUI-Bluetooth
--
2.30.0

BIN
ukui-bluetooth-1.0.0.tar.gz
View File

Binary file not shown.

BIN
ukui-bluetooth-1.0.2.tar.gz Normal file
View File

Binary file not shown.

50
ukui-bluetooth.spec
View File

@ -1,22 +1,12 @@
%define debug_package %{nil}
Name: ukui-bluetooth
Version: 1.0.0
Release: 10
Summary: Advanced ukui bluetooth
License: GPLv2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
patch0: 0001-fix-Bluetooth-pulled-up-by-the-session-manager-and-exits-abnormally.patch
patch1: 0002-fix-ukui-bluetooth-will-have-a-segfault-when-times-out.patch
patch2: 0003-fix-restart-the-system-Bluetooth-core-dump.patch
patch3: 0004-fix-repair-bug.patch
patch4: 0005-fix-control-files.patch
patch5: 0006-Update-changelog-and-format.patch
patch6: 0007-Update-Debian-changelog-info.patch
patch7: 0008-add-and-update-chanageinfo.patch
patch8: 0009-Update-README-info.patch
Name: ukui-bluetooth
Version: 1.0.2
Release: 1
Summary: Advanced ukui bluetooth
License: GPLv2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
@ -27,6 +17,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libXinerama-devel
BuildRequires: libXi-devel
BuildRequires: libXcursor-devel
BuildRequires: ukui-interface
Requires: kf5-bluez-qt
@ -34,26 +25,17 @@ Requires: kf5-bluez-qt-common
Requires: libnotify
Requires: bluez >= 5.0
Requires: bluez-obexd
Requires: pulseaudio-module-bluetooth
Requires: peony-extensions
%description
Simple bluetooth tool for ukui desktop environment
.The package contains executable file.
A lightweight Bluetooth tool based on libkf5bluezqt6 on the UKUI desktop environment
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
mkdir build && cd build
qmake-qt5 ..
@ -61,12 +43,13 @@ make
%install
rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build
make INSTALL_ROOT=%{buildroot} install
pushd build
%{make_install} INSTALL_ROOT=%{buildroot}
popd
mkdir -p %{buildroot}/usr/share/ukui-bluetooth/translations/
cp -r %{_builddir}/%{name}-%{version}/translations/*.qm %{buildroot}/usr/share/ukui-bluetooth/translations/
mkdir -p %{buildroot}/etc/xdg/autostart/
cp -r %{_builddir}/%{name}-%{version}/data/ukui-bluetooth.desktop* %{buildroot}/etc/xdg/autostart/
@ -88,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-1
- update version to 1.0.2
* Wed Dec 08 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-10
- add patch: 0009-Update-README-info.patch