New release 5.4.70
This commit is contained in:
Robin Lee
parent
d8a2bacbce
commit
6717ce3f3e
|
|
@ -12,3 +12,4 @@
|
|||
/dde-control-center-4.9.4.tar.gz
|
||||
/dde-control-center-5.0.0.tar.gz
|
||||
/dde-control-center-5.3.0.39.tar.gz
|
||||
/dde-control-center-5.4.70.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 3f38d2fd79656ae99656e701a064725d7d75d68c Mon Sep 17 00:00:00 2001
|
||||
From: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Date: Fri, 13 Nov 2020 11:10:07 +0800
|
||||
Subject: [PATCH 2/4] no user experience
|
||||
|
||||
---
|
||||
src/frame/window/modules/commoninfo/commoninfowidget.cpp | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/frame/window/modules/commoninfo/commoninfowidget.cpp b/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
index abede087c..6fb5261c0 100644
|
||||
--- a/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
+++ b/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
@@ -91,9 +91,6 @@ void CommonInfoWidget::initData()
|
||||
QMetaMethod::fromSignal(&CommonInfoWidget::requestShowDeveloperModeWidget)});
|
||||
}
|
||||
}
|
||||
- //~ contents_path /commoninfo/User Experience Program
|
||||
- m_itemList.append({"dcc_ue_plan", tr("User Experience Program"),
|
||||
- QMetaMethod::fromSignal(&CommonInfoWidget::requestShowUEPlanWidget)});
|
||||
|
||||
#if 0
|
||||
m_itemList.append({"", tr("Tablet Mode"),
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -1,189 +0,0 @@
|
|||
From 6ae28f9192bea743a19ec8c411f9d236e9dda3e9 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Date: Fri, 6 Nov 2020 10:55:08 +0800
|
||||
Subject: [PATCH 3/4] feat: Initial packit setup
|
||||
|
||||
This commit contains the specfile for building the official package for Fedora
|
||||
with a Packit setup.
|
||||
|
||||
Ultimately, a unified specfile is targeted for Fedora and any other rpm-based
|
||||
distributions, e.g. openEuler.
|
||||
|
||||
And Packit(https://packit.dev/) is a tool for maintaining specfile within
|
||||
upstream source. It requires a simple config file(.packit.yaml).
|
||||
|
||||
Log: Initial packit setup
|
||||
Signed-off-by: Robin Lee <cheeselee@fedoraproject.org>
|
||||
---
|
||||
rpm/dde-control-center.spec | 111 +++++++++++++++++++++++-------------
|
||||
1 file changed, 72 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/rpm/dde-control-center.spec b/rpm/dde-control-center.spec
|
||||
index bc5e4cc08..4f8f26d47 100644
|
||||
--- a/rpm/dde-control-center.spec
|
||||
+++ b/rpm/dde-control-center.spec
|
||||
@@ -1,89 +1,122 @@
|
||||
-Name: dde-control-center
|
||||
-Version: 5.1.0.19
|
||||
-Release: 2
|
||||
+%global repo dde-control-center
|
||||
+
|
||||
+%if 0%{?fedora}
|
||||
+%global dde_prefix deepin
|
||||
+Name: deepin-control-center
|
||||
+%else
|
||||
+%global dde_prefix dde
|
||||
+Name: %{repo}
|
||||
+%endif
|
||||
+Version: 5.3.0.68
|
||||
+Release: 1%{?fedora:%dist}
|
||||
Summary: New control center for Linux Deepin
|
||||
License: GPLv3
|
||||
-URL: https://github.com/linuxdeepin/%{name}
|
||||
-Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
+URL: https://github.com/linuxdeepin/%{repo}
|
||||
+Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
|
||||
|
||||
-#BuildRequires: dtkcore-devel >= 5.1.1
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
-BuildRequires: dde-dock-devel
|
||||
+BuildRequires: %{dde_prefix}-dock-devel
|
||||
BuildRequires: pkgconfig(dde-network-utils)
|
||||
-#BuildRequires: pkgconfig(dtkwidget) >= 5.1
|
||||
-BuildRequires: dtkwidget-devel
|
||||
+BuildRequires: dtkwidget-devel >= 5.4.0
|
||||
BuildRequires: dtkgui-devel dtkcore-devel
|
||||
-#BuildRequires: pkgconfig(dtkwidget2)
|
||||
-#BuildRequires: pkgconfig(dframeworkdbus) >= 2.0
|
||||
-BuildRequires: dde-qt-dbus-factory-devel
|
||||
+BuildRequires: %{dde_prefix}-qt-dbus-factory-devel
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: pkgconfig(geoip)
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: libpwquality-devel
|
||||
+%if 0%{?fedora}
|
||||
+BuildRequires: pkgconfig(Qt5Core)
|
||||
+BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
+BuildRequires: pkgconfig(Qt5DBus)
|
||||
+BuildRequires: pkgconfig(Qt5Multimedia)
|
||||
+BuildRequires: pkgconfig(Qt5Svg)
|
||||
+BuildRequires: pkgconfig(Qt5Sql)
|
||||
+BuildRequires: pkgconfig(Qt5Xml)
|
||||
+BuildRequires: pkgconfig(Qt5X11Extras)
|
||||
+BuildRequires: qt5-qtbase-private-devel
|
||||
+%else
|
||||
BuildRequires: qt5-devel
|
||||
+%endif
|
||||
BuildRequires: pkgconfig(xcb-ewmh)
|
||||
+BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: kf5-networkmanager-qt-devel
|
||||
BuildRequires: udisks2-qt5-devel
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: cmake
|
||||
-Requires: dde-account-faces
|
||||
-Requires: dde-api
|
||||
-Requires: dde-daemon
|
||||
-Requires: dde-qt5integration
|
||||
-Requires: dde-network-utils
|
||||
+Requires: %{dde_prefix}-account-faces
|
||||
+Requires: %{dde_prefix}-api
|
||||
+Requires: %{dde_prefix}-daemon
|
||||
+Requires: %{dde_prefix}-qt5integration
|
||||
+Requires: %{dde_prefix}-network-utils
|
||||
Requires: startdde
|
||||
+%if 0%{?fedora} == 0
|
||||
Requires: dde-server-industry-config
|
||||
+%endif
|
||||
|
||||
%description
|
||||
New control center for Linux Deepin.
|
||||
|
||||
%package devel
|
||||
-Summary: %{summary}
|
||||
+Summary: Development package for %{name}
|
||||
+Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description devel
|
||||
-%{summary}.
|
||||
+Header files and libraries for %{name}.
|
||||
|
||||
%prep
|
||||
-%setup -q -n %{name}-%{version}
|
||||
-sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
|
||||
+%autosetup -p1 -n %{repo}-%{version}
|
||||
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
|
||||
+
|
||||
+sed -i '/TARGETS/s|lib|%{_lib}|' src/frame/CMakeLists.txt
|
||||
+
|
||||
+# remove after -DDISABLE_SYS_UPDATE=YES working properly
|
||||
+sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
|
||||
+
|
||||
%build
|
||||
-%cmake . -DDCC_DISABLE_GRUB=YES \
|
||||
- -DDISABLE_SYS_UPDATE=YES
|
||||
+export PATH=%{_qt5_bindir}:$PATH
|
||||
+%cmake %{!?fedora:.} -DDCC_DISABLE_GRUB=YES \
|
||||
+ -DDISABLE_SYS_UPDATE=YES \
|
||||
+ -DCMAKE_INSTALL_LIBDIR=%{_libdir}
|
||||
+%if 0%{?fedora}
|
||||
+%cmake_build
|
||||
+%else
|
||||
%make_build
|
||||
+%endif
|
||||
|
||||
%install
|
||||
+%if 0%{?fedora}
|
||||
+%cmake_install
|
||||
+%else
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
+%endif
|
||||
# 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}/usr/lib64/cmake/DdeControlCenter
|
||||
-mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter
|
||||
-mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/
|
||||
-install -Dm644 com.deepin.controlcenter.addomain.policy %{buildroot}%{_datadir}/polkit-1/actions/
|
||||
+mkdir -p %{buildroot}%{_libdir}/%{repo}/plugins
|
||||
|
||||
%check
|
||||
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
|
||||
-
|
||||
-%ldconfig_scriptlets
|
||||
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
-%{_sysconfdir}/
|
||||
%{_bindir}/abrecovery
|
||||
-%{_bindir}/dde-control-center
|
||||
-%{_datadir}/
|
||||
+%{_bindir}/%{repo}
|
||||
+%{_libdir}/%{repo}
|
||||
%{_libdir}/libdccwidgets.so
|
||||
-/etc/xdg/autostart/deepin-ab-recovery.desktop
|
||||
+%{_datadir}/applications/%{repo}.desktop
|
||||
+%{_datadir}/dbus-1/services/*.service
|
||||
+%{_datadir}/polkit-1/actions/com.deepin.*.policy
|
||||
+%{_datadir}/%{repo}/
|
||||
+%{_datadir}/dict/MainEnglishDictionary_ProbWL.txt
|
||||
+%{_sysconfdir}/xdg/autostart/deepin-ab-recovery.desktop
|
||||
|
||||
%files devel
|
||||
-%{_includedir}/dde-control-center
|
||||
+%{_includedir}/%{repo}
|
||||
%{_libdir}/cmake/DdeControlCenter/
|
||||
|
||||
%changelog
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From 3eaa60b2251d4a78ea0620791e061531cc90d95b Mon Sep 17 00:00:00 2001
|
||||
From: justforlxz <justforlxz@gmail.com>
|
||||
Date: Tue, 27 Apr 2021 10:08:22 +0800
|
||||
Subject: [PATCH] fix: hide end user license on other linux
|
||||
|
||||
only deepin community version have
|
||||
|
||||
Log:
|
||||
---
|
||||
.../window/modules/systeminfo/systeminfowidget.cpp | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
index 7b70c611a..5c1e795e4 100644
|
||||
--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
+++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
|
||||
@@ -81,6 +81,16 @@ void SystemInfoWidget::initData()
|
||||
{"dcc_privacy_policy", tr("Privacy Policy"), QMetaMethod::fromSignal(&SystemInfoWidget::requestShowPrivacyPolicy), nullptr, "privacyPolicy"}
|
||||
};
|
||||
|
||||
+ if (DSysInfo::isCommunityEdition() && DSysInfo::productType() != DSysInfo::ProductType::Deepin) {
|
||||
+ auto it = std::find_if(m_itemList.begin(), m_itemList.end(), [=] (const ListSubItem &item) {
|
||||
+ return item.itemIcon == "dcc_protocol";
|
||||
+ });
|
||||
+
|
||||
+ if (it != m_itemList.end()) {
|
||||
+ m_itemList.erase(it);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
for (auto m : m_itemList) {
|
||||
DStandardItem *item = new DStandardItem;
|
||||
item->setIcon(QIcon::fromTheme(m.itemIcon));
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 15a3b5101853ee0b1b62e5e7dde217cbf9a454bf Mon Sep 17 00:00:00 2001
|
||||
From: wangwei <wangwei@uniontech.com>
|
||||
Date: Fri, 10 Apr 2020 22:55:46 +0800
|
||||
Subject: [PATCH] =?UTF-8?q?feat(commoninfo):=20=E7=A4=BE=E5=8C=BA=E7=89=88?=
|
||||
=?UTF-8?q?=E6=B2=A1=E6=9C=89=E2=80=9C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
|
||||
=?UTF-8?q?=E8=AE=A1=E5=88=92=E2=80=9D=E9=A1=B9?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Feat(19420) 社区版去掉用户体验计划
|
||||
---
|
||||
src/frame/window/modules/commoninfo/commoninfowidget.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/frame/window/modules/commoninfo/commoninfowidget.cpp b/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
index 47c1424e8..8c6ff52d3 100644
|
||||
--- a/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
+++ b/src/frame/window/modules/commoninfo/commoninfowidget.cpp
|
||||
@@ -108,9 +108,6 @@ void CommonInfoWidget::initData()
|
||||
m_itemList.append({"dcc_developer_mode", tr("Developer Mode"),
|
||||
QMetaMethod::fromSignal(&CommonInfoWidget::requestShowDeveloperModeWidget), nullptr, "developerMode"});
|
||||
}
|
||||
- //~ contents_path /commoninfo/User Experience Program
|
||||
- m_itemList.append({"dcc_ue_plan", tr("User Experience Program"),
|
||||
- QMetaMethod::fromSignal(&CommonInfoWidget::requestShowUEPlanWidget), nullptr, "userExperienceProgram"});
|
||||
|
||||
#if 0
|
||||
m_itemList.append({"", tr("Tablet Mode"),
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -7,44 +7,32 @@ Name: deepin-control-center
|
|||
%global dde_prefix dde
|
||||
Name: %{repo}
|
||||
%endif
|
||||
Version: 5.3.0.39
|
||||
Version: 5.4.70
|
||||
Release: %autorelease
|
||||
Summary: New control center for Linux Deepin
|
||||
License: GPLv3
|
||||
URL: https://github.com/linuxdeepin/%{repo}
|
||||
Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
|
||||
|
||||
# PATCHES FROM SOURCE GIT:
|
||||
Patch0: https://raw.githubusercontent.com/archlinux/svntogit-community/packages/deepin-control-center/trunk/deepin-control-center-systeminfo-deepin-icon.patch
|
||||
|
||||
# systeminfo-deepin-icon
|
||||
# Author: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Patch0001: 0001-systeminfo-deepin-icon.patch
|
||||
|
||||
# no user experience
|
||||
# Author: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Patch0002: 0002-no-user-experience.patch
|
||||
|
||||
# feat: Initial packit setup
|
||||
# Author: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Patch0003: 0003-feat-Initial-packit-setup.patch
|
||||
|
||||
# Arch fixes
|
||||
# Author: Robin Lee <cheeselee@fedoraproject.org>
|
||||
Patch0004: 0004-Arch-fixes.patch
|
||||
Patch1: https://raw.githubusercontent.com/archlinux/svntogit-community/packages/deepin-control-center/trunk/deepin-control-center-no-user-experience.patch
|
||||
|
||||
Patch2: https://github.com/linuxdeepin/dde-control-center/pull/387.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: %{dde_prefix}-dock-devel
|
||||
BuildRequires: pkgconfig(dde-network-utils)
|
||||
BuildRequires: dtkwidget-devel
|
||||
BuildRequires: dtkgui-devel dtkcore-devel
|
||||
BuildRequires: dtkgui-devel
|
||||
BuildRequires: dtkcore-devel
|
||||
BuildRequires: %{dde_prefix}-qt-dbus-factory-devel
|
||||
BuildRequires: deepin-pw-check-devel
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: pkgconfig(geoip)
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: libpwquality-devel
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
BuildRequires: pkgconfig(Qt5DBus)
|
||||
|
|
@ -53,26 +41,22 @@ BuildRequires: pkgconfig(Qt5Svg)
|
|||
BuildRequires: pkgconfig(Qt5Sql)
|
||||
BuildRequires: pkgconfig(Qt5Xml)
|
||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
||||
BuildRequires: cmake(PolkitQt5-1)
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
%else
|
||||
BuildRequires: qt5-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(xcb-ewmh)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: kf5-networkmanager-qt-devel
|
||||
BuildRequires: udisks2-qt5-devel
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: cmake
|
||||
BuildRequires: make
|
||||
BuildRequires: make
|
||||
Requires: %{dde_prefix}-account-faces
|
||||
Requires: %{dde_prefix}-api
|
||||
Requires: %{dde_prefix}-daemon
|
||||
Requires: %{dde_prefix}-qt5integration
|
||||
Requires: %{dde_prefix}-network-utils
|
||||
Requires: startdde
|
||||
%if 0%{?fedora} == 0
|
||||
Requires: dde-server-industry-config
|
||||
%endif
|
||||
|
||||
%description
|
||||
New control center for Linux Deepin.
|
||||
|
|
@ -85,7 +69,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||
Header files and libraries for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{repo}-%{version}
|
||||
%setup -q -n %{repo}-%{version}
|
||||
# sync with Arch
|
||||
rm src/frame/window/icons/icons/dcc_nav_systeminfo_{42,84}px.svg
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
sed -i -E '/add_compile_definitions/d' CMakeLists.txt
|
||||
|
||||
sed -i '/%{repo}/ s|/usr/lib|%{_libdir}|' src/frame/modules/update/updatework.cpp \
|
||||
|
|
@ -95,36 +86,20 @@ sed -i '/%{repo}/ s|/usr/lib|%{_libdir}|' src/frame/modules/update/updatework.cp
|
|||
|
||||
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
|
||||
|
||||
sed -i '/#include <QPointer>/i #include <QDBusMetaType>' src/frame/window/modules/network/connectioneditpage.h
|
||||
|
||||
%build
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
%cmake %{!?fedora:.} -DDCC_DISABLE_GRUB=YES \
|
||||
-DDISABLE_SYS_UPDATE=YES -DDISABLE_ACTIVATOR=YES -DDISABLE_RECOVERY=YES \
|
||||
%cmake -DDCC_DISABLE_GRUB=YES \
|
||||
-DDISABLE_SYS_UPDATE=YES -DDISABLE_RECOVERY=YES \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir}
|
||||
%if 0%{?fedora}
|
||||
%cmake_build
|
||||
%else
|
||||
%make_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?fedora}
|
||||
%cmake_install
|
||||
%else
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
%endif
|
||||
# place holder plugins dir
|
||||
mkdir -p %{buildroot}%{_libdir}/%{repo}/plugins
|
||||
|
||||
|
|
@ -134,6 +109,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
|||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_bindir}/%{repo}-wapper
|
||||
%{_bindir}/%{repo}
|
||||
%{_libdir}/%{repo}
|
||||
%{_libdir}/libdccwidgets.so
|
||||
|
|
@ -142,6 +118,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
|
|||
%{_datadir}/polkit-1/actions/com.deepin.*.policy
|
||||
%{_datadir}/%{repo}/
|
||||
%{_datadir}/dict/MainEnglishDictionary_ProbWL.txt
|
||||
%{_datadir}/glib-2.0/schemas/*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{repo}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (dde-control-center-5.3.0.39.tar.gz) = 776df57cccdfcdd58ff05696cf4ba8f6b87bc64791fc117907bd03081027d1a56b9fe213409ce8bc446cc2ed36c119bdd16778ce6e9370ca7ddefd11fc84e947
|
||||
SHA512 (dde-control-center-5.4.70.tar.gz) = 95e10dbc450ef20224d36634e27535f3175a6ea3b802ad8089e2352d3a0ef9b3e337cc5a6981afeb1e4a60ace1e3b9c838ada1a2fe7f39e6f12a23fa34e62271
|
||||
|
|
|
|||
Loading…
Reference in New Issue