Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
6ea23771b8
!27 ukui-bluetooth: fix wrong runtime dependency
From: @hou-hongxun 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2024-11-20 03:37:04 +00:00
侯红勋
76481fc25d ukui-bluetooth: fix wrong runtime dependency
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
2024-06-13 15:15:51 +08:00
openeuler-ci-bot
46b079c739
!25 fix null pointer dereference problems
From: @hou-hongxun 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2024-05-08 01:31:51 +00:00
侯红勋
d17aaac7d8 fix null pointer dereference problems
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
2024-05-07 17:32:40 +08:00
openeuler-ci-bot
383a0a8ac8
!22 change master branch spec error
From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-05-24 01:54:08 +00:00
dou33
7a42e5d69d
update ukui-bluetooth.spec.
Signed-off-by: dou33 <douyan@kylinos.cn>
2023-05-24 01:23:22 +00:00
openeuler-ci-bot
592a1236de
!20 修改spec文件
From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-04-23 02:23:27 +00:00
dou33
4cf97705e1
add requires pulseaudio-module-bluetooth
Signed-off-by: dou33 <douyan@kylinos.cn>
2023-04-19 09:49:05 +00:00
openeuler-ci-bot
075f865d39
!19 add build debuginfo and debugsource
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2023-02-08 09:11:17 +00:00
peijiankang
e2764308a6 add build debuginfo and debugsource 2023-02-08 14:31:53 +08:00
2 changed files with 84 additions and 6 deletions

View File

@ -0,0 +1,65 @@
From c1a32c45afa855547cd9b7aabc87fc16f7ec28f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
Date: Sun, 28 Apr 2024 10:06:12 +0800
Subject: [PATCH] fix possible null pointer derefrence problem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
---
ukcc-bluetooth/bluetoothmain.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ukcc-bluetooth/bluetoothmain.cpp b/ukcc-bluetooth/bluetoothmain.cpp
index 7370c3f..22fb70f 100644
--- a/ukcc-bluetooth/bluetoothmain.cpp
+++ b/ukcc-bluetooth/bluetoothmain.cpp
@@ -398,7 +398,7 @@ bluetoothadapter * BlueToothMain::createOneBluetoothAdapter(QString adapter_addr
if (adapter_dev_name.isEmpty())
{
qDebug() << Q_FUNC_INFO << "name is null!" << __LINE__;
- adapter_dev->deleteLater();
+ //adapter_dev->deleteLater();
return nullptr;
}
}
@@ -409,7 +409,7 @@ bluetoothadapter * BlueToothMain::createOneBluetoothAdapter(QString adapter_addr
if (adapter_address == tmpDev->getDevAddress())
{
qDebug() << Q_FUNC_INFO << "device existing!" << __LINE__;
- adapter_dev->deleteLater();
+ //adapter_dev->deleteLater();
return nullptr;
}
}
@@ -687,7 +687,7 @@ bluetoothdevice * BlueToothMain::createOneBluetoothDevice(QString devAddress)
if (dev_name.isEmpty())
{
qDebug() << Q_FUNC_INFO << "name is null!" << __LINE__;
- dev->deleteLater();
+ //dev->deleteLater();
return nullptr;
}
@@ -699,7 +699,7 @@ bluetoothdevice * BlueToothMain::createOneBluetoothDevice(QString devAddress)
if(isInvalidDevice(dev_name,dev_type))
{
qDebug() << Q_FUNC_INFO << "isInvalidDevice!" << __LINE__;
- dev->deleteLater();
+ //dev->deleteLater();
return nullptr;
}
@@ -709,7 +709,7 @@ bluetoothdevice * BlueToothMain::createOneBluetoothDevice(QString devAddress)
if (devAddress == tmpDev->getDevAddress())
{
qDebug() << Q_FUNC_INFO << "device existing!" << __LINE__;
- dev->deleteLater();
+ //dev->deleteLater();
return nullptr;
}
}
--
2.43.0

View File

@ -1,12 +1,11 @@
%define debug_package %{nil}
Name: ukui-bluetooth
Version: 1.0.3
Release: 1
Release: 5
Summary: Advanced ukui bluetooth
License: GPLv2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-possible-null-pointer-derefrence-problem.patch
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
@ -20,22 +19,24 @@ BuildRequires: libXcursor-devel
BuildRequires: ukui-interface
BuildRequires: libukcc-devel
BuildRequires: polkit-qt5-1-devel
Requires: kf5-bluez-qt-devel
Requires: kf5-bluez-qt
Requires: libnotify
Requires: bluez >= 5.0
Requires: bluez-obexd
Requires: peony-extensions
Requires: pulseaudio-module-bluetooth
%description
A lightweight Bluetooth tool based on libkf5bluezqt6 on the UKUI desktop environment
%prep
%setup -q
%patch 1 -p1
%build
mkdir build && cd build
qmake-qt5 ..
make
%{qmake_qt5} ..
%{make_build}
%install
rm -rf $RPM_BUILD_ROOT
@ -74,6 +75,18 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jun 13 2024 houhongxun <houhongxun@kylinos.cn> - 1.0.3-5
- fix wrong runtime dependency
* Sun Apr 28 2024 houhongxun <houhongxun@kylinos.cn> - 1.0.3-4
- fix null pointer dereference problems
* Sat Apr 08 2023 douyan <douyan@kylinos.cn> - 1.0.3-3
- add requires pulseaudio-module-bluetooth
* Wed Feb 08 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.3-2
- add build debuginfo and debugsource
* Fri Nov 18 2022 douyan <douyan@kylinos.cn> - 1.0.3-1
- update to upstream version 1.0.3