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

[Felix Yan]

    Date: Thursday, August 6, 2020 @ 05:33:18
  Author: felixonmars
Revision: 670505

upgpkg: deepin-control-center 5.3.0.3-1

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

---------------------------------------+
 PKGBUILD                              |    9 +---
 deepin-control-center-build-fix.patch |   65 --------------------------------
 2 files changed, 3 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-06 05:28:10 UTC (rev 670504)
+++ PKGBUILD	2020-08-06 05:33:18 UTC (rev 670505)
@@ -3,13 +3,13 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=5.2.0.27
+pkgver=5.3.0.3
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-control-center"
 license=('GPL3')
-depends=('desktop-file-utils' 'dtkwidget' 'deepin-account-faces' 'deepin-api' 'geoip'
+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' 'ninja' 'qt5-tools')
@@ -25,11 +25,9 @@
 replaces=('dde-control-center' 'dde-dock-applets')
 groups=('deepin')
 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
         $pkgname-no-user-experience.patch)
-sha512sums=('b33ab3844fb3233866d34d760d1070a205e6f06898de36372d7a9e88a55fc211a58de4d5d96a66327636a20c9ee85eb0ab376cc127e4d891cc1f0db2526af6d1'
-            'b2eaf966bc352032bca995a7f9757f9bf929600785bec3159db028d5aeae28e5c7d63313c1b0de2edf58a3ae7eb13b8ab9581b7c1466d31036607eae7369c2b6'
+sha512sums=('05ddc82f822f7ab866c3ae0da14a685b6c6d4b2f5b0bff058f35b1e33d941203f3aee923bbf8fc98b1d6d8db0841a73a537762f7b9be3f50dc3ef153455c6052'
             '74fd63391e923ca37f4559f30da967ba7f33d4426b60d58d1ece8cd9a154578e8184b1a376a8d7ff3ef81ffce530915f79d0845a2612ae4e06522b96855ab3dd'
             '99fc7e369680f3a91cb30daaa9015fccf3f2b733522e917fbd94e69b48471dd739536e220d4a9c17a93834d51192832cabf355b633cca27c903f8dd3249f4c5d')
 
@@ -37,7 +35,6 @@
   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-build-fix.patch
   mkdir -p build
 
   cd dde-control-center-$pkgver

Deleted: deepin-control-center-build-fix.patch
===================================================================
--- deepin-control-center-build-fix.patch	2020-08-06 05:28:10 UTC (rev 670504)
+++ deepin-control-center-build-fix.patch	2020-08-06 05:33:18 UTC (rev 670505)
@@ -1,65 +0,0 @@
-From 3703e1b3bdbe1e27435011aa021f13f6b5aa3c32 Mon Sep 17 00:00:00 2001
-From: justforlxz <justforlxz at gmail.com>
-Date: Fri, 1 May 2020 16:44:42 +0800
-Subject: [PATCH] fix: build failed on archlinux
-
----
- src/frame/updatenotifier.cpp                           | 4 ++--
- src/frame/window/mainwindow.cpp                        | 2 ++
- src/frame/window/modules/accounts/avatarlistwidget.cpp | 2 +-
- src/frame/window/search/searchwidget.cpp               | 1 +
- 4 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/frame/updatenotifier.cpp b/src/frame/updatenotifier.cpp
-index d30178285..b3c2a9400 100644
---- a/src/frame/updatenotifier.cpp
-+++ b/src/frame/updatenotifier.cpp
-@@ -186,8 +186,8 @@ bool UpdateNotifier::comparePkgLists(QStringList val1, QStringList val2)
- {
-     if (val1.length() != val2.length()) return false;
- 
--    qSort(val1.begin(), val1.end());
--    qSort(val2.begin(), val2.end());
-+    std::sort(val1.begin(), val1.end());
-+    std::sort(val2.begin(), val2.end());
- 
-     return val1 == val2;
- }
-diff --git a/src/frame/window/mainwindow.cpp b/src/frame/window/mainwindow.cpp
-index 3824a4e38..868865ec8 100644
---- a/src/frame/window/mainwindow.cpp
-+++ b/src/frame/window/mainwindow.cpp
-@@ -59,6 +59,8 @@
- #include <QGSettings>
- #include <QScroller>
- #include <QScreen>
-+#include <QMouseEvent>
-+#include <QResizeEvent>
- 
- using namespace DCC_NAMESPACE;
- using namespace DCC_NAMESPACE::search;
-diff --git a/src/frame/window/modules/accounts/avatarlistwidget.cpp b/src/frame/window/modules/accounts/avatarlistwidget.cpp
-index 16bd33ee3..d690ae876 100644
---- a/src/frame/window/modules/accounts/avatarlistwidget.cpp
-+++ b/src/frame/window/modules/accounts/avatarlistwidget.cpp
-@@ -200,7 +200,7 @@ void AvatarListWidget::addItemFromDefaultDir()
-     QFileInfoList list = dir.entryInfoList();
- 
-     //根据文件名进行排序
--    qSort(list.begin(), list.end(), [&](const QFileInfo &fileinfo1, const QFileInfo &fileinfo2) {
-+    std::sort(list.begin(), list.end(), [&](const QFileInfo &fileinfo1, const QFileInfo &fileinfo2) {
-         return fileinfo1.baseName() < fileinfo2.baseName();
-     });
- 
-diff --git a/src/frame/window/search/searchwidget.cpp b/src/frame/window/search/searchwidget.cpp
-index 00f5b8830..33763ebb9 100755
---- a/src/frame/window/search/searchwidget.cpp
-+++ b/src/frame/window/search/searchwidget.cpp
-@@ -33,6 +33,7 @@
- #include <QPainter>
- #include <QRect>
- #include <QApplication>
-+#include <QKeyEvent>
- 
- using namespace DCC_NAMESPACE;
- using namespace DCC_NAMESPACE::search;