87 lines
3.9 KiB
Diff
87 lines
3.9 KiB
Diff
From e9566285e57231a4d0a6a5185490d6cdb4bdf69f Mon Sep 17 00:00:00 2001
|
|
From: Robin Lee <cheeselee@fedoraproject.org>
|
|
Date: Fri, 13 Nov 2020 11:15:27 +0800
|
|
Subject: [PATCH 4/4] Arch fixes
|
|
|
|
---
|
|
rpm/dde-control-center.spec | 22 +++++++++++++++-------
|
|
1 file changed, 15 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/rpm/dde-control-center.spec b/rpm/dde-control-center.spec
|
|
index 4f8f26d47..4ee0acf7d 100644
|
|
--- a/rpm/dde-control-center.spec
|
|
+++ b/rpm/dde-control-center.spec
|
|
@@ -7,7 +7,7 @@ Name: deepin-control-center
|
|
%global dde_prefix dde
|
|
Name: %{repo}
|
|
%endif
|
|
-Version: 5.3.0.68
|
|
+Version: 5.3.0.39
|
|
Release: 1%{?fedora:%dist}
|
|
Summary: New control center for Linux Deepin
|
|
License: GPLv3
|
|
@@ -18,7 +18,7 @@ BuildRequires: gcc-c++
|
|
BuildRequires: desktop-file-utils
|
|
BuildRequires: %{dde_prefix}-dock-devel
|
|
BuildRequires: pkgconfig(dde-network-utils)
|
|
-BuildRequires: dtkwidget-devel >= 5.4.0
|
|
+BuildRequires: dtkwidget-devel
|
|
BuildRequires: dtkgui-devel dtkcore-devel
|
|
BuildRequires: %{dde_prefix}-qt-dbus-factory-devel
|
|
BuildRequires: pkgconfig(gsettings-qt)
|
|
@@ -71,17 +71,28 @@ sed -i -E '/add_compile_definitions/d' CMakeLists.txt
|
|
|
|
sed -i '/%{repo}/ s|/usr/lib|%{_libdir}|' src/frame/modules/update/updatework.cpp \
|
|
src/frame/window/mainwindow.cpp \
|
|
- src/frame/window/insertplugin.cpp
|
|
+ com.deepin.controlcenter.develop.policy \
|
|
+ README.md
|
|
|
|
sed -i '/TARGETS/s|lib|%{_lib}|' src/frame/CMakeLists.txt
|
|
|
|
+sed -i '/#include <QPainter>/a #include <QPainterPath>' src/frame/widgets/basiclistdelegate.cpp src/frame/window/modules/update/updatehistorybutton.cpp \
|
|
+ src/frame/window/modules/commoninfo/commonbackgrounditem.cpp src/frame/modules/accounts/useroptionitem.cpp \
|
|
+ src/frame/window/modules/sync/pages/avatarwidget.cpp src/frame/window/modules/accounts/avataritemdelegate.cpp \
|
|
+ src/frame/modules/accounts/avatarwidget.cpp src/frame/window/modules/accounts/accountswidget.cpp \
|
|
+ src/frame/modules/datetime/timezone_dialog/popup_menu.cpp src/frame/modules/display/recognizedialog.cpp \
|
|
+ src/frame/window/modules/personalization/roundcolorwidget.cpp src/frame/window/modules/unionid/pages/avatarwidget.cpp
|
|
+sed -i '/#include <QRect>/a #include <QPainterPath>' src/frame/window/modules/personalization/personalizationgeneral.cpp
|
|
+
|
|
+sed -i 's|/bin/deepin-recovery-tool|%{_bindir}/deepin-recovery-tool|' src/frame/window/modules/systeminfo/backupandrestoreworker.cpp
|
|
+
|
|
# remove after -DDISABLE_SYS_UPDATE=YES working properly
|
|
sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
|
|
|
|
%build
|
|
export PATH=%{_qt5_bindir}:$PATH
|
|
%cmake %{!?fedora:.} -DDCC_DISABLE_GRUB=YES \
|
|
- -DDISABLE_SYS_UPDATE=YES \
|
|
+ -DDISABLE_SYS_UPDATE=YES -DDISABLE_ACTIVATOR=YES -DDISABLE_RECOVERY=YES \
|
|
-DCMAKE_INSTALL_LIBDIR=%{_libdir}
|
|
%if 0%{?fedora}
|
|
%cmake_build
|
|
@@ -104,7 +115,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
|
%files
|
|
%doc README.md
|
|
%license LICENSE
|
|
-%{_bindir}/abrecovery
|
|
%{_bindir}/%{repo}
|
|
%{_libdir}/%{repo}
|
|
%{_libdir}/libdccwidgets.so
|
|
@@ -113,7 +123,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
|
%{_datadir}/polkit-1/actions/com.deepin.*.policy
|
|
%{_datadir}/%{repo}/
|
|
%{_datadir}/dict/MainEnglishDictionary_ProbWL.txt
|
|
-%{_sysconfdir}/xdg/autostart/deepin-ab-recovery.desktop
|
|
|
|
%files devel
|
|
%{_includedir}/%{repo}
|
|
@@ -128,4 +137,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
|
|
|
* Fri May 29 2020 uniontech <uoser@uniontech.com> - 5.0.30
|
|
- Project init.
|
|
-
|
|
--
|
|
2.26.2
|
|
|