[arch-commits] Commit in deepin-control-center/trunk (2 files)

[Felix Yan]

    Date: Monday, April 26, 2021 @ 23:41:15
  Author: felixonmars
Revision: 924660

upgpkg: deepin-control-center 5.4.17-1

Modified:
  deepin-control-center/trunk/PKGBUILD
  deepin-control-center/trunk/deepin-control-center-no-user-experience.patch

------------------------------------------------+
 PKGBUILD                                       |   23 +++++++++++------------
 deepin-control-center-no-user-experience.patch |   10 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-26 23:38:39 UTC (rev 924659)
+++ PKGBUILD	2021-04-26 23:41:15 UTC (rev 924660)
@@ -3,8 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=5.3.99.20210113
-_commit=e478c8ac3213c6d9659a1ec27d066e323a69b96c
+pkgver=5.4.17
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
@@ -12,8 +11,8 @@
 license=('GPL3')
 depends=('desktop-file-utils' 'dtkwidget' 'deepin-account-faces' 'deepin-api' 'geoip' 'libpwquality'
          'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde' 'networkmanager-qt'
-         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils')
-makedepends=('cmake' 'deepin-dock' 'gtest' 'ninja' 'qt5-tools')
+         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils' 'deepin-pw-check')
+makedepends=('cmake' 'deepin-dock' 'gmock' 'gtest' 'ninja' 'qt5-tools')
 optdepends=('redshift: automatic color temperature support'
             'networkmanager-openconnect: for OpenConnect support'
             'networkmanager-openvpn: for OpenVPN support'
@@ -25,20 +24,20 @@
 conflicts=('dde-control-center' 'dde-dock-applets')
 replaces=('dde-control-center' 'dde-dock-applets')
 groups=('deepin')
-source=("https://github.com/linuxdeepin/dde-control-center/archive/$_commit/$pkgname-$_commit.tar.gz"
+source=("https://github.com/linuxdeepin/dde-control-center/archive/$pkgver/$pkgname-$pkgver.tar.gz"
         $pkgname-systeminfo-deepin-icon.patch
         $pkgname-no-user-experience.patch)
-sha512sums=('be23a36873c1971c55f7f3c093068d4d2883408c71e45b60ad3013e0293a9d4caf3e2391f5406058945bda800b7600330c74ab356d5b4a2f506fe0e030af4217'
+sha512sums=('4d8f15c3107ccd4b3be308a76fb6f2ee34a50829c09a2cb7d1423470803713d49e3da20f4caf08e57474e08e9e05168f57bfde0eb35e85e116adc186d192187b'
             '74fd63391e923ca37f4559f30da967ba7f33d4426b60d58d1ece8cd9a154578e8184b1a376a8d7ff3ef81ffce530915f79d0845a2612ae4e06522b96855ab3dd'
-            '6828c137af055c564df55e043c6a827a843c834906e2a66a59f9b2c8da80ca348ad98e24d2142100a198cd7fdb363a71e150e9392e93c09728c3d3ffb474748f')
+            'b7f766e4dad9840a716ac22458b387626da712f56a546475f71639182273417bd3135b978a3926fe234bf7bae0c353c1d7cbb08ad386c2691f6b1223b1938bfa')
 
 prepare() {
-  rm dde-control-center-$_commit/src/frame/window/icons/icons/dcc_nav_systeminfo_{42,84}px.svg
-  patch -d dde-control-center-$_commit -Np1 < $pkgname-systeminfo-deepin-icon.patch
-  patch -d dde-control-center-$_commit -Np1 < $pkgname-no-user-experience.patch
+  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
   mkdir -p build
 
-  cd dde-control-center-$_commit
+  cd dde-control-center-$pkgver
   # remove after they obey -DDISABLE_SYS_UPDATE properly
   sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
 }
@@ -46,7 +45,7 @@
 build() {
   cd build
   cmake -GNinja -DDISABLE_SYS_UPDATE=YES -DDISABLE_RECOVERY=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    ../dde-control-center-$_commit
+    ../dde-control-center-$pkgver
   ninja
 }
 

Modified: deepin-control-center-no-user-experience.patch
===================================================================
--- deepin-control-center-no-user-experience.patch	2021-04-26 23:38:39 UTC (rev 924659)
+++ deepin-control-center-no-user-experience.patch	2021-04-26 23:41:15 UTC (rev 924660)
@@ -14,16 +14,16 @@
  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 1c0b4b4fa..aec40194a 100644
+index 47c1424e8..8c6ff52d3 100644
 --- a/src/frame/window/modules/commoninfo/commoninfowidget.cpp
 +++ b/src/frame/window/modules/commoninfo/commoninfowidget.cpp
-@@ -78,10 +78,7 @@ void CommonInfoWidget::initData()
-                                            QMetaMethod::fromSignal(&CommonInfoWidget::requestShowDeveloperModeWidget)});
-             }
+@@ -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)});
+-                           QMetaMethod::fromSignal(&CommonInfoWidget::requestShowUEPlanWidget), nullptr, "userExperienceProgram"});
  
  #if 0
          m_itemList.append({"", tr("Tablet Mode"),