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

[Felix Yan]

    Date: Wednesday, June 3, 2020 @ 17:24:51
  Author: felixonmars
Revision: 638359

upgpkg: deepin-control-center 5.2.0.0-1

Modified:
  deepin-control-center/trunk/PKGBUILD
  deepin-control-center/trunk/deepin-control-center-build-fix.patch

---------------------------------------+
 PKGBUILD                              |   28 ++++++++++++++++++++--------
 deepin-control-center-build-fix.patch |    6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-03 17:20:05 UTC (rev 638358)
+++ PKGBUILD	2020-06-03 17:24:51 UTC (rev 638359)
@@ -3,8 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=5.1.0101.0.20200427
-_commit=9c2778ea06c9182273b27f440e3dd8df533a72f3
+pkgver=5.2.0.0
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
@@ -25,17 +24,30 @@
 conflicts=('dde-control-center' 'dde-dock-applets')
 replaces=('dde-control-center' 'dde-dock-applets')
 groups=('deepin')
-source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$_commit.tar.gz"
-        $pkgname-build-fix.patch)
-sha512sums=('1d776b6a590b5d7b692eaec6dce16dc005d75dd6152a64e48b6ee7f6d05ab89ab6020c64c5ffb7e5961772f72cc6d58c2820e5d97da001c7d2a0b2e0b022c708'
-            'f19cbef03edb458b5dce941b9d4f25d4b0838490da37950ed6ab0c7b13b8ce236ff2115718f3fece230d7c5dbb2d74970695ac55d5f03b9ebf6bd7b8553e40aa')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz"
+        $pkgname-build-fix.patch
+        $pkgname-systeminfo-deepin-icon.patch::https://github.com/linuxdeepin/dde-control-center/commit/2b282b5271ff01741f062a6eb8a74b386e2ada48.patch
+        $pkgname-no-user-experience.patch::https://github.com/linuxdeepin/dde-control-center/commit/15a3b5101853ee0b1b62e5e7dde217cbf9a454bf.patch)
+sha512sums=('f07c934179f9167977f9af2bef8c5cd5849d462b12a7a3590df2e65308a634b5dbb13e009d5bec4f27aa3cb8abe1f196262c8129b5abc26dc02c4a2e8d8f2a8b'
+            'e36681ee79ba90360217c7dd3cf432ac2e04cc343d60c3580232a894d74edd73f455445bedaaf833a6092b710d4e98ef03e85edb213e3bf5d2f42261a0e769b1'
+            'ca045eaf14079ce2fb8be264c0f5442c61a14ea54d3783d6275cd7da7ca258d21144349088caba8831fd7508cc429cb6f9507315b5446f00f9e1bbee446f02e5'
+            '692061ec6d5cce41a41239bcb75aec3ee1d002f5d6e9e86df795808edb080caf9978de2a23d267bad960a8436670252957c767aa30a19d4a702719e7d9a6f94f')
 
 prepare() {
-  mv dde-control-center-{$_commit,$pkgver}
-  patch -d dde-control-center-$pkgver -p1 < $pkgname-build-fix.patch
+  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-build-fix.patch
   mkdir -p build
 
   cd dde-control-center-$pkgver
+  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
+  sed -i '/#include <QRect>/a #include <QPainterPath>' src/frame/window/modules/personalization/personalizationgeneral.cpp
+
   sed -i 's|/bin/restore-tool|/usr/bin/restore-tool|' src/frame/window/modules/systeminfo/backupandrestoreworker.cpp \
                                                       com.deepin.controlcenter.restore.policy
   sed -i 's| /bin| /usr/bin|' src/restore-tool/CMakeLists.txt

Modified: deepin-control-center-build-fix.patch
===================================================================
--- deepin-control-center-build-fix.patch	2020-06-03 17:20:05 UTC (rev 638358)
+++ deepin-control-center-build-fix.patch	2020-06-03 17:24:51 UTC (rev 638359)
@@ -55,10 +55,10 @@
 index 00f5b8830..33763ebb9 100755
 --- a/src/frame/window/search/searchwidget.cpp
 +++ b/src/frame/window/search/searchwidget.cpp
-@@ -31,6 +31,7 @@
- #include <QXmlStreamReader>
- #include <QCompleter>
+@@ -32,6 +32,7 @@
  #include <QRegularExpression>
+ #include <QPainter>
+ #include <QRect>
 +#include <QKeyEvent>
  
  using namespace DCC_NAMESPACE;