Date: Sunday, July 31, 2022 @ 11:54:21
Author: felixonmars
Revision: 1259313
upgpkg: deepin-control-center 5.5.77-1
Modified:
deepin-control-center/trunk/PKGBUILD
Deleted:
deepin-control-center/trunk/deepin-control-center-no-user-experience.patch
------------------------------------------------+
PKGBUILD | 18 +++++---------
deepin-control-center-no-user-experience.patch | 29 -----------------------
2 files changed, 7 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-31 11:53:40 UTC (rev 1259312)
+++ PKGBUILD 2022-07-31 11:54:21 UTC (rev 1259313)
@@ -3,8 +3,8 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=deepin-control-center
-pkgver=5.4.70
-pkgrel=2
+pkgver=5.5.77
+pkgrel=1
pkgdesc='New control center for linux deepin'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-control-center";
@@ -26,18 +26,14 @@
groups=('deepin')
source=("https://github.com/linuxdeepin/dde-control-center/archive/$pkgver/$pkgname-$pkgver.tar.gz";
$pkgname-systeminfo-deepin-icon.patch
- $pkgname-no-user-experience.patch
-
$pkgname-hide-end-user-license.patch::https://github.com/linuxdeepin/dde-control-center/pull/387.patch)
-sha512sums=('95e10dbc450ef20224d36634e27535f3175a6ea3b802ad8089e2352d3a0ef9b3e337cc5a6981afeb1e4a60ace1e3b9c838ada1a2fe7f39e6f12a23fa34e62271'
+
$pkgname-add-option-to-disable-deepin-authentication.patch::https://github.com/linuxdeepin/dde-control-center/pull/407.patch)
+sha512sums=('f1be8efcb3ba3293612ebf191e424f6ac3e90c0d3708ba3079a25de794bdde2e8a49679ac0bfba6aab9e9208944ae4e525a7455e48017eacf997ad2f604bb41b'
'74fd63391e923ca37f4559f30da967ba7f33d4426b60d58d1ece8cd9a154578e8184b1a376a8d7ff3ef81ffce530915f79d0845a2612ae4e06522b96855ab3dd'
-
'b7f766e4dad9840a716ac22458b387626da712f56a546475f71639182273417bd3135b978a3926fe234bf7bae0c353c1d7cbb08ad386c2691f6b1223b1938bfa'
-
'c3f2366d1ac361d3577548329910fe218ae076078084a72543d67b1804ebe437479bf0f592166d3b00d120fe9cf16e4e89fb6ddb82430d9e0e4d0a90266b51ee')
+
'6e7d1e3b23b0a0918be664506ed90248e484392f00188242cbd4bfe6eaf91ddd18bc9b2d9bba28d06f72f7deb46532eb4ae3c210ac17094d4b4607c086cc7a31')
prepare() {
rm
dde-control-center-$pkgver/src/frame/window/icons/icons/dcc_nav_systeminfo_{42,84}px.svg
patch -d dde-control-center-$pkgver -Np1 <
$pkgname-systeminfo-deepin-icon.patch
- patch -d dde-control-center-$pkgver -Np1 < $pkgname-no-user-experience.patch
- patch -d dde-control-center-$pkgver -Np1 <
$pkgname-hide-end-user-license.patch
mkdir -p build
cd dde-control-center-$pkgver
@@ -44,12 +40,12 @@
# remove after they obey -DDISABLE_SYS_UPDATE 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
+ patch -p1 -i ../$pkgname-add-option-to-disable-deepin-authentication.patch
}
build() {
cd build
- cmake -GNinja -DDISABLE_SYS_UPDATE=YES -DDISABLE_RECOVERY=YES
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ cmake -GNinja -DDISABLE_SYS_UPDATE=YES -DDISABLE_AUTHENTICATION=YES
-DDISABLE_RECOVERY=YES -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
../dde-control-center-$pkgver
ninja
}
Deleted: deepin-control-center-no-user-experience.patch
===================================================================
--- deepin-control-center-no-user-experience.patch 2022-07-31 11:53:40 UTC
(rev 1259312)
+++ deepin-control-center-no-user-experience.patch 2022-07-31 11:54:21 UTC
(rev 1259313)
@@ -1,29 +0,0 @@
-From 15a3b5101853ee0b1b62e5e7dde217cbf9a454bf Mon Sep 17 00:00:00 2001
-From: wangwei <wang...@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"),
