!24 update dtkgui to 5.6.8.4
From: @lliuzhi Reviewed-by: @ut-layne-yang Signed-off-by: @ut-layne-yang
This commit is contained in:
openeuler-ci-bot
Gitee
commit
45c02b11bc
@ -0,0 +1,61 @@
|
||||
From 6389063edae59a2eab7c80996b412cfca1639911 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Thomas <paulthomas100199@gmail.com>
|
||||
Date: Tue, 30 Jan 2024 14:19:15 +0800
|
||||
Subject: [PATCH] The ID of the current Session is used to register the
|
||||
singleton process
|
||||
|
||||
---
|
||||
include/kernel/dguiapplicationhelper.h | 1 +
|
||||
src/kernel/dguiapplicationhelper.cpp | 17 ++++++++++++++++-
|
||||
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/kernel/dguiapplicationhelper.h b/include/kernel/dguiapplicationhelper.h
|
||||
index 72e3577..d777a36 100644
|
||||
--- a/include/kernel/dguiapplicationhelper.h
|
||||
+++ b/include/kernel/dguiapplicationhelper.h
|
||||
@@ -137,6 +137,7 @@ Q_SIGNALS:
|
||||
protected:
|
||||
explicit DGuiApplicationHelper();
|
||||
virtual void initialize();
|
||||
+ static QString getSessionID();
|
||||
|
||||
private:
|
||||
D_PRIVATE_SLOT(void _q_initApplicationTheme(bool))
|
||||
diff --git a/src/kernel/dguiapplicationhelper.cpp b/src/kernel/dguiapplicationhelper.cpp
|
||||
index f9b3fd1..913c410 100644
|
||||
--- a/src/kernel/dguiapplicationhelper.cpp
|
||||
+++ b/src/kernel/dguiapplicationhelper.cpp
|
||||
@@ -491,6 +491,21 @@ void DGuiApplicationHelper::initialize()
|
||||
d->init();
|
||||
}
|
||||
|
||||
+QString DGuiApplicationHelper::getSessionID()
|
||||
+{
|
||||
+ QString sessionID = "0";
|
||||
+
|
||||
+ QDBusInterface *inter = new QDBusInterface("org.freedesktop.DBus",
|
||||
+ "/org/freedesktop/DBus",
|
||||
+ "org.freedesktop.DBus",
|
||||
+ QDBusConnection::sessionBus());
|
||||
+
|
||||
+ sessionID = inter->call("GetId").arguments().value(0).toString();
|
||||
+ inter->deleteLater();
|
||||
+
|
||||
+ return sessionID;
|
||||
+}
|
||||
+
|
||||
/*!
|
||||
\brief 创建 DGuiApplicationHelper 对象.
|
||||
|
||||
@@ -1369,7 +1384,7 @@ bool DGuiApplicationHelper::setSingleInstance(const QString &key, DGuiApplicatio
|
||||
_d_singleServer->close();
|
||||
}
|
||||
|
||||
- QString socket_key = "_d_dtk_single_instance_";
|
||||
+ QString socket_key = QString("_d_dtk_single_instance_%1_").arg(getSessionID());
|
||||
|
||||
switch (singleScope) {
|
||||
case GroupScope:
|
||||
--
|
||||
2.20.1
|
||||
|
||||
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
||||
# dtkgui
|
||||
|
||||
#### Description
|
||||
dtkgui
|
||||
|
||||
#### 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 @@
|
||||
# dtkgui
|
||||
|
||||
#### 介绍
|
||||
dtkgui
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
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. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
|
||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
Binary file not shown.
BIN
dtkgui-5.6.8.4.tar.gz
Normal file
BIN
dtkgui-5.6.8.4.tar.gz
Normal file
Binary file not shown.
74
dtkgui.spec
74
dtkgui.spec
@ -1,25 +1,33 @@
|
||||
Name: dtkgui
|
||||
Version: 5.5.27
|
||||
Release: 1
|
||||
Version: 5.6.8.4
|
||||
Release: 5%{?dist}
|
||||
Summary: Deepin dtkgui
|
||||
License: LGPLv3+
|
||||
URL: https://github.com/linuxdeepin/dtkgui
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: 0001-The-ID-of-the-current-Session-is-used-to-register-th.patch
|
||||
|
||||
BuildRequires: qt5-qtx11extras-devel
|
||||
BuildRequires: dtkcommon-devel
|
||||
BuildRequires: dtkcommon-devel dtkcore
|
||||
BuildRequires: dtkcore-devel
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: annobin
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: gcc-c++ gtest-devel
|
||||
BuildRequires: annobin qt5-qttools-devel
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: gmock-devel
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: LibRaw-devel
|
||||
BuildRequires: qt5-qtimageformats
|
||||
BuildRequires: libqtxdg-devel
|
||||
BuildRequires: freeimage-devel
|
||||
Requires: qt5-qtimageformats
|
||||
%description
|
||||
Dtkgui is the GUI module for DDE look and feel.
|
||||
|
||||
@ -32,16 +40,12 @@ Requires: dtkcore-devel%{?_isa}
|
||||
Header files and libraries for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
%qmake_qt5 PREFIX=%{_prefix} \
|
||||
DTK_VERSION=%{version} \
|
||||
LIB_INSTALL_DIR=%{_libdir} \
|
||||
BIN_INSTALL_DIR=%{_libexecdir}/dtk5 \
|
||||
TOOL_INSTALL_DIR=%{_libexecdir}/dtk5
|
||||
%cmake
|
||||
%make_build
|
||||
|
||||
%install
|
||||
@ -51,39 +55,37 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_libdir}/lib%{name}.so.5*
|
||||
%{_libexecdir}/dtk5/deepin-gui-settings
|
||||
%{_libexecdir}/dtk5/dde-kwin-debug
|
||||
%{_libexecdir}/dtk5/dnd-test-client
|
||||
%{_libexecdir}/dtk5/dnd-test-server
|
||||
%{_libdir}/dtk5/DGui/
|
||||
%{_datadir}/*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/libdtk-*/
|
||||
%{_includedir}/dtk5/
|
||||
%{_libdir}/pkgconfig/dtkgui.pc
|
||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_dtkgui.pri
|
||||
%{_libdir}/cmake/DtkGui/
|
||||
%{_libdir}/lib%{name}.so
|
||||
|
||||
%changelog
|
||||
* Mon Jul 24 2023 leeffo <liweiganga@uniontech.com> - 5.5.27-1
|
||||
- update: update to version 5.5.27
|
||||
* Tue Jan 30 2024 liweiganga <liweiganga@uniontech.com> - 5.6.8.4-5
|
||||
- fix: The ID of the current Session is used to register the singleton process(bugid:223507)
|
||||
|
||||
* Thu Mar 23 2023 liweiganga <liweiganga@uniontech.com> - 5.5.18-1
|
||||
- update to 5.5.18
|
||||
* Thu Dec 21 2023 mahailiang <mahailiang@uniontech.com> - 5.6.8.4-4
|
||||
- fix: move org.deepin.dtk.gui.preference.json (bugid:234863)
|
||||
|
||||
* Tue Jul 19 2022 konglidong <konglidong@uniontech.com> - 5.4.10-1
|
||||
- Update to 5.4.10
|
||||
* Thu Dec 21 2023 mahailiang <mahailiang@uniontech.com> - 5.6.8.4-3
|
||||
- fix: add requires qt5-qtimageformats(bugid:226895)
|
||||
|
||||
* Sat Jan 29 2022 liweigang <liweiganga@uniontech.com> - 5.2.2.1-3
|
||||
- fix build error
|
||||
* Wed Oct 11 2023 liweigang <liweiganga@uniontech.com> - 5.6.8.4-2
|
||||
- spec: change DGui path
|
||||
|
||||
* Thu Jul 15 2021 weidong <weidong@uniontech.com> - 5.2.2.1-2
|
||||
- Format spec
|
||||
* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.8.4-1
|
||||
- update: update to version 5.6.8.4
|
||||
|
||||
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.2.2.1-1
|
||||
- Update 5.2.2.1
|
||||
* Wed Aug 16 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.8.3-1
|
||||
- update: update to 5.6.8.3
|
||||
|
||||
* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.2.0-2
|
||||
- fix source url in spec
|
||||
* Fri Dec 23 2022 liweiganga <liweiganga@uniontech.com> - 5.5.27-1
|
||||
- update: update to 5.5.27
|
||||
|
||||
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.2.0-1
|
||||
- Package init
|
||||
* Mon Jun 13 2022 uoser <uoser@uniontech.com> - 5.5.18-1.01
|
||||
- update: update to 5.5.18-1.01
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: github
|
||||
src_repo: linuxdeepin/dtkgui
|
||||
tag_prefix: ^v
|
||||
seperator: .
|
||||
Loading…
x
Reference in New Issue
Block a user