Compare commits
11 Commits
c62881f32f
...
e4cfeda00f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4cfeda00f | ||
|
|
41712f9da7 | ||
|
|
51da048027 | ||
|
|
308ce2857f | ||
|
|
09c34810b4 | ||
|
|
a8791ed1cc | ||
|
|
5299c93068 | ||
|
|
5d08a6c652 | ||
|
|
e65aa5331b | ||
|
|
01e9f8ee65 | ||
|
|
9ff41a001b |
@ -0,0 +1,25 @@
|
||||
From 2195d2302d073b10a09f1c9c65c02a6bb3ff16fd Mon Sep 17 00:00:00 2001
|
||||
From: liweigang <liweiganga@uniontech.com>
|
||||
Date: Thu, 23 Jun 2022 17:22:20 +0800
|
||||
Subject: [PATCH] fix: modify eulerServerEnduserAgreement_new path
|
||||
|
||||
---
|
||||
src/frame/window/protocolfile.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/frame/window/protocolfile.cpp b/src/frame/window/protocolfile.cpp
|
||||
index 6cbb461..87f3da2 100644
|
||||
--- a/src/frame/window/protocolfile.cpp
|
||||
+++ b/src/frame/window/protocolfile.cpp
|
||||
@@ -30,7 +30,7 @@ DCORE_USE_NAMESPACE
|
||||
|
||||
const static QString serverEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt";
|
||||
const static QString serverEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Server/End-User-License-Agreement-Server-CN-%1.txt";
|
||||
-const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-Euler-%1.txt";
|
||||
+const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt";
|
||||
const static QString homeEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Home-CN-%1.txt";
|
||||
const static QString homeEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Home/End-User-License-Agreement-Home-CN-%1.txt";
|
||||
const static QString professionalEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Professional-CN-%1.txt";
|
||||
--
|
||||
2.20.1
|
||||
|
||||
32
0001-fix-Array-out-of-bounds-causes-crash-handling.patch
Normal file
32
0001-fix-Array-out-of-bounds-causes-crash-handling.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 96ad287f01dc69ae1f98f2fd884fc0a97b1cc234 Mon Sep 17 00:00:00 2001
|
||||
From: liweigang <izmirvii@gmail.com>
|
||||
Date: Fri, 22 Mar 2024 09:48:17 +0800
|
||||
Subject: [PATCH] fix: Array out of bounds causes crash handling
|
||||
|
||||
Signed-off-by: liweigang <izmirvii@gmail.com>
|
||||
---
|
||||
src/frame/window/modules/systeminfo/systeminfowidget.cpp | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
index 0d753d4..745fb19 100644
|
||||
--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
+++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
@@ -95,6 +95,14 @@ void SystemInfoWidget::initData()
|
||||
connect(m_listView, &DListView::clicked, this, &SystemInfoWidget::onListClicked);
|
||||
connect(m_listView, &DListView::activated, m_listView, &DListView::clicked);
|
||||
connect(GSettingWatcher::instance(), &GSettingWatcher::requestUpdateSecondMenu, this, &SystemInfoWidget::onRequestUpdateSecondMenu);
|
||||
+ if (IsServerSystem) {
|
||||
+ connect(GSettingWatcher::instance(),
|
||||
+ &GSettingWatcher::requestUpdateSecondMenu, this, [this](int row) {
|
||||
+ if (m_itemList.size() > row && m_itemList[row].gsettingsName == "editionLicense") {
|
||||
+ m_listView->setRowHidden(row, true);
|
||||
+ }
|
||||
+ });
|
||||
+ }
|
||||
}
|
||||
|
||||
DListView *SystemInfoWidget::getSystemListViewPointer()
|
||||
--
|
||||
2.33.1
|
||||
|
||||
BIN
dde-control-center-5.4.84.7.tar.gz
Normal file
BIN
dde-control-center-5.4.84.7.tar.gz
Normal file
Binary file not shown.
128
dde-control-center.spec
Normal file
128
dde-control-center.spec
Normal file
@ -0,0 +1,128 @@
|
||||
Name: dde-control-center
|
||||
Version: 5.4.84.7
|
||||
Release: 3
|
||||
Summary: New control center for Linux Deepin
|
||||
License: GPLv3
|
||||
URL: https://github.com/linuxdeepin/%{name}
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
#add by uos
|
||||
Patch0001: 0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
|
||||
Patch0002: 0001-fix-Array-out-of-bounds-causes-crash-handling.patch
|
||||
#end
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: dde-dock-devel
|
||||
BuildRequires: pkgconfig(dde-network-utils)
|
||||
BuildRequires: dtkwidget-devel
|
||||
BuildRequires: dtkgui-devel dtkcore-devel
|
||||
BuildRequires: dde-qt-dbus-factory-devel
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: pkgconfig(geoip)
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: libpwquality-devel
|
||||
BuildRequires: qt5-devel
|
||||
BuildRequires: pkgconfig(xcb-ewmh)
|
||||
BuildRequires: kf5-networkmanager-qt-devel
|
||||
BuildRequires: udisks2-qt5-devel
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: polkit-qt5-1-devel
|
||||
BuildRequires: deepin-pw-check
|
||||
BuildRequires: deepin-pw-check-devel
|
||||
Requires: dde-account-faces
|
||||
Requires: dde-api
|
||||
Requires: dde-daemon
|
||||
Requires: dde-qt5integration
|
||||
Requires: dde-network-utils
|
||||
Requires: startdde
|
||||
Requires: dde-server-industry-config
|
||||
Requires: deepin-pw-check
|
||||
Requires: NetworkManager-l2tp
|
||||
Requires: cracklib
|
||||
|
||||
%description
|
||||
New control center for Linux Deepin.
|
||||
|
||||
%package devel
|
||||
Summary: %{summary}
|
||||
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
|
||||
sed -i -E '/add_compile_definitions/d' CMakeLists.txt
|
||||
patch com.deepin.dde.control-center.gschema.xml < rpm/com.deepin.dde.control-center.gschema.xml.patch
|
||||
|
||||
%build
|
||||
%cmake . -DDCC_DISABLE_GRUB=YES \
|
||||
-DCVERSION=%{version} \
|
||||
-DDISABLE_SYS_UPDATE=YES
|
||||
%make_build
|
||||
|
||||
%post
|
||||
## create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt
|
||||
|
||||
%postun
|
||||
## if [ "$1" = "0" ] ; then
|
||||
## create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt
|
||||
## fi
|
||||
|
||||
%install
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
# place holder plugins dir
|
||||
mkdir -p %{buildroot}%{_libdir}/%{name}/plugins
|
||||
# https://github.com/linuxdeepin/dde-control-center/issues/115
|
||||
# And we disabled SYS_UPDATE, so reboot-reminder-dialog is useless.
|
||||
#rm %{buildroot}%{_bindir}/reboot-reminder-dialog
|
||||
mkdir -p %{buildroot}%{_libdir}/cmake/DdeControlCenter
|
||||
mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}%{_libdir}/cmake/DdeControlCenter
|
||||
%ifnarch %{ix86}
|
||||
mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/
|
||||
%endif
|
||||
install -Dm644 com.deepin.controlcenter.addomain.policy %{buildroot}%{_datadir}/polkit-1/actions/
|
||||
|
||||
%check
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_sysconfdir}/
|
||||
%{_bindir}/abrecovery
|
||||
%{_bindir}/dde-control-center
|
||||
%{_bindir}/dde-control-center-wapper
|
||||
%{_datadir}/
|
||||
%{_libdir}/libdccwidgets.so
|
||||
/etc/xdg/autostart/deepin-ab-recovery.desktop
|
||||
|
||||
%files devel
|
||||
%{_includedir}/dde-control-center
|
||||
%{_libdir}/cmake/DdeControlCenter/
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2024 liweigang <liweiganga@uniontech.com> - 5.4.84.7-3
|
||||
- fix: Array out of bounds causes crash handling
|
||||
|
||||
* Mon Nov 27 2023 hanshuang <hanshuang@uniontech.com> - 5.4.84.7-2
|
||||
- update package
|
||||
|
||||
* Fri Sep 4 2020 chenbo pan <panchenbo@uniontech.com> 5.1.0.19-3
|
||||
- fix compile fail
|
||||
|
||||
* Fri Jul 3 2020 uniontech <uoser@uniontech.com> - 5.1.0.19-2
|
||||
- Add dde.sh to profile.d
|
||||
|
||||
* Mon Jun 15 2020 uniontech <uoser@uniontech.com> - 5.1.0.19
|
||||
- Remove the universal menu.
|
||||
|
||||
* Fri May 29 2020 uniontech <uoser@uniontech.com> - 5.0.30
|
||||
- Project init.
|
||||
4
dde-control-center.yaml
Normal file
4
dde-control-center.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: linuxdeepin/dde-control-center
|
||||
tag_prefix: ^v
|
||||
seperator: .
|
||||
Loading…
x
Reference in New Issue
Block a user