Try to rebootstrap on riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -14,3 +14,4 @@
 /dde-control-center-5.3.0.39.tar.gz
 /dde-control-center-5.4.70.tar.gz
 /dde-control-center-5.5.77.tar.gz
+/dde-control-center-5.5.158.tar.gz

407.patch

@@ -1,94 +0,0 @@
-From 2e2ae848e22037c92da1d4c0522675ac61fa4597 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Wed, 16 Mar 2022 16:38:18 +0800
-Subject: [PATCH] feat: add build flag to disable authentication module
-
-Log: authentication module make error in other distribution
-
-Task: https://github.com/linuxdeepin/developer-center/issues/2245
----
- src/frame/CMakeLists.txt        | 15 ++++++++++++++-
- src/frame/window/mainwindow.cpp |  6 ++++++
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/frame/CMakeLists.txt b/src/frame/CMakeLists.txt
-index 5f78f1ec0c..32eb467657 100644
---- a/src/frame/CMakeLists.txt
-+++ b/src/frame/CMakeLists.txt
-@@ -31,6 +31,8 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-     set(CMAKE_INSTALL_PREFIX /usr)
- endif ()
- 
-+option(DISABLE_AUTHENTICATION "disable authentication module" OFF)
-+
- set(DEFINED_LIST
- DISABLE_OPACITY_ANIMATION
- DISABLE_CLOUD_SYNC
-@@ -536,6 +538,10 @@ set(SRCS
-         ${NOTIFICATION_FILES}
- )
- 
-+if (DEFINED DISABLE_AUTHENTICATION)
-+    list(REMOVE_ITEM SRCS ${AUTHENTICATION_FILES})
-+endif()
-+
- set(QRC
-         frame.qrc
-         modules/wacom/wacom.qrc
-@@ -560,6 +566,10 @@ set(QRC
-         window/modules/update/dccv20update.qrc
- )
- 
-+if (DEFINED DISABLE_AUTHENTICATION)
-+    list(REMOVE_ITEM QRC modules/authentication/authentication.qrc)
-+endif()
-+
- # Find the library
- find_package(PkgConfig REQUIRED)
- find_package(DtkWidget REQUIRED)
-@@ -604,7 +614,10 @@ file(GLOB DCONFIG_FILES "../../configs/org.deepin.dde.control-center*.json")
- dconfig_meta_files(APPID dde-control-center BASE ../../configs FILES ${DCONFIG_FILES})
- 
- set(DEEPIN_PW_CHECK libdeepin_pw_check.so)
--set(SHMN_VIDEO libdareader.so)
-+
-+if (NOT DEFINED DISABLE_AUTHENTICATION)
-+    set(SHMN_VIDEO libdareader.so)
-+endif()
- 
- function(add_build_macro macro)
-     string(TOUPPER ${macro} macro)
-diff --git a/src/frame/window/mainwindow.cpp b/src/frame/window/mainwindow.cpp
-index bc902844f9..097f826ca7 100644
---- a/src/frame/window/mainwindow.cpp
-+++ b/src/frame/window/mainwindow.cpp
-@@ -18,7 +18,9 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-+#ifndef DISABLE_AUTHENTICATION
- #include "modules/authentication/loginoptionsmodule.h"
-+#endif
- #include "modules/accounts/accountsmodule.h"
- #include "modules/bluetooth/bluetoothmodule.h"
- #include "modules/commoninfo/commoninfomodule.h"
-@@ -312,7 +314,9 @@ void MainWindow::initAllModule(const QString &m)
-         return;
- 
-     m_bInit = true;
-+#ifndef DISABLE_AUTHENTICATION
-     using namespace authentication;
-+#endif
-     using namespace sync;
-     using namespace datetime;
-     using namespace defapp;
-@@ -332,7 +336,9 @@ void MainWindow::initAllModule(const QString &m)
-     using namespace notification;
- 
-     m_modules = {
-+    #ifndef DISABLE_AUTHENTICATION
-         { new LoginOptionsModule(this), tr("Biometric Authentication")},
-+    #endif
-         { new AccountsModule(this), tr("Accounts")},
-         { new DisplayModule(this), tr("Display")},
-         { new TouchscreenModule(this), tr("Touch Screen")},

deepin-control-center.spec

@@ -7,26 +7,25 @@ Name:           deepin-control-center
 %global dde_prefix dde
 Name:           %{repo}
 %endif
-Version:        5.5.77
-Release:        %autorelease
+Version:        5.5.158
+Release:        %autorelease -e 0.riscv64
 Summary:        New control center for Linux Deepin
-License:        GPLv3
+# migrated to SPDX
+License:        LGPL-3.0-or-later
 URL:            https://github.com/linuxdeepin/%{repo}
 Source0:        %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
 
-Patch0:      https://raw.githubusercontent.com/archlinux/svntogit-community/60ac39ad6f703cb47cbbb24cc4c882609bad25b7/trunk/deepin-control-center-systeminfo-deepin-icon.patch
-
-Patch1:      https://patch-diff.githubusercontent.com/raw/linuxdeepin/dde-control-center/pull/407.patch
+Patch0:         https://raw.githubusercontent.com/archlinux/svntogit-community/60ac39ad6f703cb47cbbb24cc4c882609bad25b7/trunk/deepin-control-center-systeminfo-deepin-icon.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
-BuildRequires:  %{dde_prefix}-dock-devel
-BuildRequires:  pkgconfig(dde-network-utils)
+#BuildRequires:  %{dde_prefix}-dock-devel
 BuildRequires:  dtkwidget-devel
 BuildRequires:  dtkgui-devel
 BuildRequires:  dtkcore-devel
 BuildRequires:  %{dde_prefix}-qt-dbus-factory-devel
 BuildRequires:  deepin-pw-check-devel
+#BuildRequires:  deepin-pw-check-devel >= 5.1.16
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(geoip)
 BuildRequires:  pkgconfig(libnm)
@@ -54,19 +53,26 @@ BuildRequires:  gtest-devel
 BuildRequires:  qt5-linguist
 BuildRequires:  cmake
 BuildRequires:  make
+Requires:       %{name}-lib%{?_isa} = %{version}-%{release}
 Requires:       %{dde_prefix}-account-faces
 Requires:       %{dde_prefix}-api
 Requires:       %{dde_prefix}-daemon
 Requires:       %{dde_prefix}-qt5integration
-Requires:       %{dde_prefix}-network-utils
 Requires:       startdde
+Requires:       %{dde_prefix}-network-core
 
 %description
 New control center for Linux Deepin.
 
+%package lib
+Summary:        Shared library for %{name}
+
+%description lib
+This package provides shared library %{name}.
+
 %package devel
 Summary:        Development package for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-lib%{?_isa} = %{version}-%{release}
 
 %description devel
 Header files and libraries for %{name}.
@@ -76,45 +82,33 @@ Header files and libraries for %{name}.
 # sync with Arch
 rm src/frame/window/icons/icons/dcc_nav_systeminfo_{42,84}px.svg
 
-%patch0 -p1
-%patch1 -p1
-
-sed -i -E '/add_compile_definitions/d; 's:lib/:%{_lib}/: CMakeLists.txt
-
-sed -i '/%{repo}/ s|/usr/lib|%{_libdir}|' src/frame/modules/update/updatework.cpp \
-                                          src/frame/window/mainwindow.cpp \
-                                          com.deepin.controlcenter.develop.policy \
-                                          README.md
+%patch -P 0 -p1
 
+# needed for properly installing the main library
 sed -i '/TARGETS/s|lib|%{_lib}|' src/frame/CMakeLists.txt
 
-# sync with Arch
-# remove after they obey -DDISABLE_SYS_UPDATE properly
-sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
-
 %build
 export PATH=%{_qt5_bindir}:$PATH
-%cmake -DDCC_DISABLE_GRUB=YES \
-       -DDISABLE_SYS_UPDATE=YES -DDISABLE_RECOVERY=YES \
-       -DCMAKE_INSTALL_LIBDIR=%{_libdir}
+%cmake -DDISABLE_ACTIVATOR=YES \
+       -DDISABLE_AUTHENTICATION=YES \
+       -DDISABLE_DEVELOPER_MODE=YES \
+       -DDISABLE_RECOVERY=YES \
+       -DDISABLE_SYS_UPDATE=YES \
+       -DDCC_DISABLE_GRUB=YES \
+       -DCMAKE_INSTALL_LIBDIR=%{_libdir}  # needed for properly installing cmake file
 %cmake_build
 
 %install
 %cmake_install
-# place holder plugins dir
-mkdir -p %{buildroot}%{_libdir}/%{repo}/plugins
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
 
 %files
 %doc README.md
-%license LICENSE
 %{_bindir}/%{repo}-wapper
 %{_bindir}/%{repo}
-%{_libdir}/%{repo}
-%{_libdir}/libdccwidgets.so
-%{_libdir}/dde-grand-search-daemon/
+%{_prefix}/lib/dde-grand-search-daemon/
 %{_datadir}/applications/%{repo}.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/polkit-1/actions/com.deepin.*.policy
@@ -123,9 +117,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/dsg/
 
+%files lib
+%license LICENSE
+%{_libdir}/libdccwidgets.so
+
 %files devel
 %{_includedir}/%{repo}
 %{_libdir}/cmake/DdeControlCenter/
+%{_datadir}/dman/
 
 %changelog
 %autochangelog

sources

@@ -1 +1 @@
-SHA512 (dde-control-center-5.5.77.tar.gz) = f1be8efcb3ba3293612ebf191e424f6ac3e90c0d3708ba3079a25de794bdde2e8a49679ac0bfba6aab9e9208944ae4e525a7455e48017eacf997ad2f604bb41b
+SHA512 (dde-control-center-5.5.158.tar.gz) = bff1140685c04e1cbb5d949033a9913f1b166a95be24df111b5a73598ea044811404f62879dbcb2722b6cea1e191bdbfe58a7a02b9b58c3016a6c2f05bb03fe4