[arch-commits] Commit in deepin-control-center/repos/community-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Mon May 25 02:05:17 UTC 2020


    Date: Monday, May 25, 2020 @ 02:05:17
  Author: felixonmars
Revision: 633682

archrelease: copy trunk to community-x86_64

Added:
  deepin-control-center/repos/community-x86_64/PKGBUILD
    (from rev 633680, deepin-control-center/trunk/PKGBUILD)
  deepin-control-center/repos/community-x86_64/deepin-control-center-build-fix.patch
    (from rev 633680, deepin-control-center/trunk/deepin-control-center-build-fix.patch)
Deleted:
  deepin-control-center/repos/community-x86_64/PKGBUILD
  deepin-control-center/repos/community-x86_64/deepin-control-center-build-fix.patch

---------------------------------------+
 PKGBUILD                              |  114 ++++++++++++++--------------
 deepin-control-center-build-fix.patch |  130 ++++++++++++++++----------------
 2 files changed, 122 insertions(+), 122 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-25 02:05:09 UTC (rev 633681)
+++ PKGBUILD	2020-05-25 02:05:17 UTC (rev 633682)
@@ -1,57 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-control-center
-pkgver=5.1.0.12.20200429
-_commit=d9f20a322c59a80d0bd90007fb564422ab410843
-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'
-         'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde' 'networkmanager-qt'
-         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils')
-makedepends=('deepin-dock' 'cmake' 'qt5-tools')
-optdepends=('redshift: automatic color temperature support'
-            'networkmanager-openconnect: for OpenConnect support'
-            'networkmanager-openvpn: for OpenVPN support'
-            'networkmanager-pptp: for PPTP support'
-            'networkmanager-strongswan: for StrongSwan support'
-            'networkmanager-vpnc: for VPNC support'
-            'network-manager-sstp: for SSTP support')
-# Not packaged: network-manager-l2tp
-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=('91ff1f323471dc3c2493fe91e0df2fce304f5b910f9ca60c5e5ab72061214e01d5d60d9238c223a4fb67bc1045fcc6a9e0903f3a854d22c734f7e553bcce991b'
-            'f19cbef03edb458b5dce941b9d4f25d4b0838490da37950ed6ab0c7b13b8ce236ff2115718f3fece230d7c5dbb2d74970695ac55d5f03b9ebf6bd7b8553e40aa')
-
-prepare() {
-  mv dde-control-center-{$_commit,$pkgver}
-  patch -d dde-control-center-$pkgver -p1 < $pkgname-build-fix.patch
-  mkdir -p build
-
-  cd dde-control-center-$pkgver
-  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
-
-  # remove after they obey -DDISABLE_SYS_UPDATE properly
-  sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
-}
-
-build() {
-  cd build
-  cmake -DDISABLE_SYS_UPDATE=YES -DCMAKE_INSTALL_PREFIX=/usr \
-    ../dde-control-center-$pkgver
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 633680, deepin-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-25 02:05:17 UTC (rev 633682)
@@ -0,0 +1,57 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-control-center
+pkgver=5.1.0101.0.20200427
+_commit=9c2778ea06c9182273b27f440e3dd8df533a72f3
+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'
+         'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde' 'networkmanager-qt'
+         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils')
+makedepends=('deepin-dock' 'cmake' 'qt5-tools')
+optdepends=('redshift: automatic color temperature support'
+            'networkmanager-openconnect: for OpenConnect support'
+            'networkmanager-openvpn: for OpenVPN support'
+            'networkmanager-pptp: for PPTP support'
+            'networkmanager-strongswan: for StrongSwan support'
+            'networkmanager-vpnc: for VPNC support'
+            'network-manager-sstp: for SSTP support')
+# Not packaged: network-manager-l2tp
+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')
+
+prepare() {
+  mv dde-control-center-{$_commit,$pkgver}
+  patch -d dde-control-center-$pkgver -p1 < $pkgname-build-fix.patch
+  mkdir -p build
+
+  cd dde-control-center-$pkgver
+  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
+
+  # remove after they obey -DDISABLE_SYS_UPDATE properly
+  sed -i '/new UpdateModule/d' src/frame/window/mainwindow.cpp
+}
+
+build() {
+  cd build
+  cmake -DDISABLE_SYS_UPDATE=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    ../dde-control-center-$pkgver
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: deepin-control-center-build-fix.patch
===================================================================
--- deepin-control-center-build-fix.patch	2020-05-25 02:05:09 UTC (rev 633681)
+++ deepin-control-center-build-fix.patch	2020-05-25 02:05:17 UTC (rev 633682)
@@ -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 <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
-@@ -31,6 +31,7 @@
- #include <QXmlStreamReader>
- #include <QCompleter>
- #include <QRegularExpression>
-+#include <QKeyEvent>
- 
- using namespace DCC_NAMESPACE;
- using namespace DCC_NAMESPACE::search;

Copied: deepin-control-center/repos/community-x86_64/deepin-control-center-build-fix.patch (from rev 633680, deepin-control-center/trunk/deepin-control-center-build-fix.patch)
===================================================================
--- deepin-control-center-build-fix.patch	                        (rev 0)
+++ deepin-control-center-build-fix.patch	2020-05-25 02:05:17 UTC (rev 633682)
@@ -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
+@@ -31,6 +31,7 @@
+ #include <QXmlStreamReader>
+ #include <QCompleter>
+ #include <QRegularExpression>
++#include <QKeyEvent>
+ 
+ using namespace DCC_NAMESPACE;
+ using namespace DCC_NAMESPACE::search;


More information about the arch-commits mailing list