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

[Felix Yan]

    Date: Monday, May 11, 2020 @ 19:22:41
  Author: felixonmars
Revision: 626353

upgpkg: deepin-control-center 5.1.0.11-1

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

---------------------------------------+
 PKGBUILD                              |    8 +--
 deepin-control-center-build-fix.patch |   65 ++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-11 19:22:32 UTC (rev 626352)
+++ PKGBUILD	2020-05-11 19:22:41 UTC (rev 626353)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=5.1.0.5
+pkgver=5.1.0.11
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
@@ -25,9 +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::https://github.com/linuxdeepin/dde-control-center/pull/276.patch)
-sha512sums=('2a0501df75f13f8ffbf92a3edc3219f8fda9596a8dcba41988de2fabbf80a471a5f66ca1aaeaaac0e87c60269d79885c990b92ab05d1697ff1e48261330d2dad'
-            'f19cbef03edb458b5dce941b9d4f25d4b0838490da37950ed6ab0c7b13b8ce236ff2115718f3fece230d7c5dbb2d74970695ac55d5f03b9ebf6bd7b8553e40aa')
+        $pkgname-build-fix.patch)
+sha512sums=('4c82ec7b937cc66cd0d0606edcfdaeda4468d5fa3ef3bd7cd5d7e9282289b3e36aac7ee11181dbb5981bf8dd1242dd237a0a055b22138979d48351ea80df8fd7'
+            'e36681ee79ba90360217c7dd3cf432ac2e04cc343d60c3580232a894d74edd73f455445bedaaf833a6092b710d4e98ef03e85edb213e3bf5d2f42261a0e769b1')
 
 prepare() {
   patch -d dde-control-center-$pkgver -p1 < $pkgname-build-fix.patch

Added: deepin-control-center-build-fix.patch
===================================================================
--- deepin-control-center-build-fix.patch	                        (rev 0)
+++ deepin-control-center-build-fix.patch	2020-05-11 19:22:41 UTC (rev 626353)
@@ -0,0 +1,65 @@
+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 <QLinearGradient>
+ #include <QGSettings>
+ #include <QScroller>
++#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
+@@ -32,6 +32,7 @@
+ #include <QRegularExpression>
+ #include <QPainter>
+ #include <QRect>
++#include <QKeyEvent>
+ 
+ using namespace DCC_NAMESPACE;
+ using namespace DCC_NAMESPACE::search;