Date: Wednesday, June 3, 2020 @ 17:25:09 Author: felixonmars Revision: 638360
archrelease: copy trunk to community-testing-x86_64 Added: deepin-control-center/repos/community-testing-x86_64/ deepin-control-center/repos/community-testing-x86_64/PKGBUILD (from rev 638359, deepin-control-center/trunk/PKGBUILD) deepin-control-center/repos/community-testing-x86_64/deepin-control-center-build-fix.patch (from rev 638359, deepin-control-center/trunk/deepin-control-center-build-fix.patch) ---------------------------------------+ PKGBUILD | 69 ++++++++++++++++++++++++++++++++ deepin-control-center-build-fix.patch | 65 ++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) Copied: deepin-control-center/repos/community-testing-x86_64/PKGBUILD (from rev 638359, deepin-control-center/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-06-03 17:25:09 UTC (rev 638360) @@ -0,0 +1,69 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-control-center +pkgver=5.2.0.0 +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-$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() { + 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 + + # 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 +} Copied: deepin-control-center/repos/community-testing-x86_64/deepin-control-center-build-fix.patch (from rev 638359, deepin-control-center/trunk/deepin-control-center-build-fix.patch) =================================================================== --- community-testing-x86_64/deepin-control-center-build-fix.patch (rev 0) +++ community-testing-x86_64/deepin-control-center-build-fix.patch 2020-06-03 17:25:09 UTC (rev 638360) @@ -0,0 +1,65 @@ +From 3703e1b3bdbe1e27435011aa021f13f6b5aa3c32 Mon Sep 17 00:00:00 2001 +From: justforlxz <justfor...@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;