Date: Friday, July 3, 2020 @ 12:50:22 Author: felixonmars Revision: 657625
archrelease: copy trunk to community-x86_64 Added: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 657624, deepin-control-center/trunk/PKGBUILD) deepin-control-center/repos/community-x86_64/deepin-control-center-build-fix.patch (from rev 657624, 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 | 144 ++++++++++++++++---------------- deepin-control-center-build-fix.patch | 130 ++++++++++++++-------------- 2 files changed, 137 insertions(+), 137 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-03 12:50:04 UTC (rev 657624) +++ PKGBUILD 2020-07-03 12:50:22 UTC (rev 657625) @@ -1,72 +0,0 @@ -# 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.11 -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=('5476cf1f48e182810de6262ab44db369d7358dc5e3e9ef2bb545bbee637eb0411560479b39cf29aced2f215258b521d5a320f21f906496f2b502a15335062718' - 'dddd9d0ed5452250a1360039c6dfd56312b1439e938bdbebcfbc924324780019b04aec552998b3f5a44ada78e9718c86a0b4912a4dd57530da7ea79108e4aeee' - '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 src/frame/window/modules/unionid/pages/avatarwidget.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 - - rm "$pkgdir"/etc/xdg/autostart/deepin-ab-recovery.desktop - rmdir "$pkgdir"/etc/xdg/autostart "$pkgdir"/etc/xdg "$pkgdir"/etc -} Copied: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 657624, deepin-control-center/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-03 12:50:22 UTC (rev 657625) @@ -0,0 +1,72 @@ +# 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.13 +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=('b86a25942b0602f8f39600c9c471c751448a3724f125f0e8f0f6fbf8c4277a5e10f2e2c620bc535a9722b0a9645e70db6658868192e708ef36c564d036a97c38' + 'dddd9d0ed5452250a1360039c6dfd56312b1439e938bdbebcfbc924324780019b04aec552998b3f5a44ada78e9718c86a0b4912a4dd57530da7ea79108e4aeee' + '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 src/frame/window/modules/unionid/pages/avatarwidget.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 + + rm "$pkgdir"/etc/xdg/autostart/deepin-ab-recovery.desktop + rmdir "$pkgdir"/etc/xdg/autostart "$pkgdir"/etc/xdg "$pkgdir"/etc +} Deleted: deepin-control-center-build-fix.patch =================================================================== --- deepin-control-center-build-fix.patch 2020-07-03 12:50:04 UTC (rev 657624) +++ deepin-control-center-build-fix.patch 2020-07-03 12:50:22 UTC (rev 657625) @@ -1,65 +0,0 @@ -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 -@@ -33,6 +33,7 @@ - #include <QPainter> - #include <QRect> - #include <QApplication> -+#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 657624, 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-07-03 12:50:22 UTC (rev 657625) @@ -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 +@@ -33,6 +33,7 @@ + #include <QPainter> + #include <QRect> + #include <QApplication> ++#include <QKeyEvent> + + using namespace DCC_NAMESPACE; + using namespace DCC_NAMESPACE::search;