!3 update to 1.1.28.1
From: @lliuzhi Reviewed-by: @ut-layne-yang Signed-off-by: @ut-layne-yang
This commit is contained in:
openeuler-ci-bot
Gitee
commit
6dfa71b8a8
53
0001-feat-add-missing-include.patch
Normal file
53
0001-feat-add-missing-include.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From 075bcd9b83fe4ac7057b3f2a40cc869538ac0207 Mon Sep 17 00:00:00 2001
|
||||
From: liweigang <liweiganga@uniontech.com>
|
||||
Date: Thu, 12 Oct 2023 11:06:17 +0800
|
||||
Subject: [PATCH] feat: add missing include
|
||||
|
||||
---
|
||||
net-view/operation/private/netmanagerthreadprivate.cpp | 2 ++
|
||||
net-view/operation/private/netsecretagent.cpp | 2 ++
|
||||
src/impl/networkmanager/activeconnectioninfo.cpp | 2 ++
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/net-view/operation/private/netmanagerthreadprivate.cpp b/net-view/operation/private/netmanagerthreadprivate.cpp
|
||||
index f9b0626..d08a4b5 100644
|
||||
--- a/net-view/operation/private/netmanagerthreadprivate.cpp
|
||||
+++ b/net-view/operation/private/netmanagerthreadprivate.cpp
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
#include <QDBusConnection>
|
||||
#include <QThread>
|
||||
+#include <QTimer>
|
||||
+#include <QtMath>
|
||||
|
||||
using namespace NetworkManager;
|
||||
|
||||
diff --git a/net-view/operation/private/netsecretagent.cpp b/net-view/operation/private/netsecretagent.cpp
|
||||
index 5626e34..2fe8134 100644
|
||||
--- a/net-view/operation/private/netsecretagent.cpp
|
||||
+++ b/net-view/operation/private/netsecretagent.cpp
|
||||
@@ -14,6 +14,8 @@
|
||||
#include <QJsonArray>
|
||||
#include <QStringBuilder>
|
||||
#include <QtDBus/qdbusmetatype.h>
|
||||
+#include <QTimer>
|
||||
+#include <QJsonObject>
|
||||
|
||||
static const QString NetworkDialogApp = "dde-network-dialog"; // 网络列表执行文件
|
||||
|
||||
diff --git a/src/impl/networkmanager/activeconnectioninfo.cpp b/src/impl/networkmanager/activeconnectioninfo.cpp
|
||||
index 8d0b73d..a68a324 100644
|
||||
--- a/src/impl/networkmanager/activeconnectioninfo.cpp
|
||||
+++ b/src/impl/networkmanager/activeconnectioninfo.cpp
|
||||
@@ -8,6 +8,8 @@
|
||||
#include <NetworkManagerQt/Security8021xSetting>
|
||||
#include <NetworkManagerQt/VpnSetting>
|
||||
|
||||
+#include <QJsonArray>
|
||||
+
|
||||
using namespace dde::network;
|
||||
|
||||
#define ServiceTypeL2TP "org.freedesktop.NetworkManager.l2tp"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
||||
# dde-network-core
|
||||
|
||||
#### Description
|
||||
Deepin desktop-environment - network core files
|
||||
|
||||
#### Software Architecture
|
||||
Software architecture description
|
||||
|
||||
#### Installation
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Instructions
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### Gitee Feature
|
||||
|
||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
37
README.md
37
README.md
@ -1,37 +0,0 @@
|
||||
# dde-network-core
|
||||
|
||||
#### 介绍
|
||||
Deepin desktop-environment - network core files
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
|
||||
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
Binary file not shown.
BIN
dde-network-core-1.1.28.1.tar.gz
Normal file
BIN
dde-network-core-1.1.28.1.tar.gz
Normal file
Binary file not shown.
@ -1,10 +1,12 @@
|
||||
Name: dde-network-core
|
||||
Version: 1.0.74
|
||||
Release: 1
|
||||
Version: 1.1.28.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Deepin desktop-environment - network core files
|
||||
License: GPLv3
|
||||
URL: https://github.com/linuxdeepin/dde-network-core
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0001: 0001-feat-add-missing-include.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
@ -26,9 +28,12 @@ BuildRequires: dde-control-center-devel
|
||||
BuildRequires: dde-dock-devel
|
||||
BuildRequires: dde-qt-dbus-factory-devel
|
||||
BuildRequires: dde-session-shell-devel
|
||||
BuildRequires: systemd-devel
|
||||
|
||||
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: gmock-devel
|
||||
BuildRequires: gmock
|
||||
|
||||
Obsoletes: dde-network-utils <= 5.4.15
|
||||
|
||||
%description
|
||||
@ -43,7 +48,7 @@ Obsoletes: dde-network-utils-devel <= 5.4.15
|
||||
Header files and libraries for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
sed -i 's|lib/|%{_lib}/|' dock-network-plugin/CMakeLists.txt
|
||||
|
||||
@ -59,16 +64,15 @@ cd build
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%{_bindir}/dde-network-dialog
|
||||
%{_prefix}/lib/dde-control-center/
|
||||
%{_libdir}/dde-dock/
|
||||
%{_prefix}/lib/dde-session-shell/
|
||||
%{_libdir}/libdde-network-core.so*
|
||||
%{_datadir}/dsg/
|
||||
%{_datadir}/dcc-network-plugin/
|
||||
%{_datadir}/dde-network-dialog/
|
||||
%{_datadir}/dock-network-plugin/
|
||||
%{_datadir}/dss-network-plugin/
|
||||
%{_datadir}/dde-network-core/translations/*.qm
|
||||
/var/lib/polkit-1/localauthority/10-vendor.d/10-network-manager.pkla
|
||||
|
||||
%files devel
|
||||
@ -76,5 +80,30 @@ cd build
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Mon Aug 14 2023 leeffo <liweiganga@uniontech.com> - 1.0.74-1
|
||||
* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 1.1.28.1-1
|
||||
- update: update to version 1.1.28.1
|
||||
|
||||
* Mon Sep 18 2023 liuzhilin <liuzhilin@uniontech.com> - 1.1.18.4-1.01
|
||||
- spec: add buildrequires gmock
|
||||
|
||||
* Wed Aug 16 2023 liuzhilin <liuzhilin@uniontech.com> - 1.1.18.4-1
|
||||
- update: update to 1.1.18.4
|
||||
|
||||
* Fri Mar 31 2023 mahailiang <mahailiang@uniontech.com> - 1.0.74-5
|
||||
- rebuild
|
||||
|
||||
* Fri Feb 03 2023 liweiganga <liweiganga@uniontech.com> - 1.0.74-4
|
||||
- spec: del provided
|
||||
- spec: fix plugins path
|
||||
|
||||
* Fri Feb 03 2023 liweiganga <liweiganga@uniontech.com> - 1.0.74-3
|
||||
- spec: temporarily provided to support compilation
|
||||
|
||||
* Fri Feb 03 2023 liweiganga <liweiganga@uniontech.com> - 1.0.74-2
|
||||
- spec: fix error Obsoletes version
|
||||
|
||||
* Thu Feb 02 2023 liweiganga <liweiganga@uniontech.com> - 1.0.74-1.01
|
||||
- spec: fix plugins path
|
||||
|
||||
* Fri Jan 06 2023 liweiganga <liweiganga@uniontech.com> - 1.0.74-1
|
||||
- init: init package
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: github
|
||||
src_repo: linuxdeepin/dde-network-core
|
||||
tag_prefix: ^v
|
||||
separator: .
|
||||
Loading…
x
Reference in New Issue
Block a user