Date: Thursday, October 26, 2017 @ 07:56:19 Author: felixonmars Revision: 264425
archrelease: copy trunk to community-i686, community-x86_64 Added: deepin-control-center/repos/community-i686/PKGBUILD (from rev 264424, deepin-control-center/trunk/PKGBUILD) deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 264424, deepin-control-center/trunk/PKGBUILD) Deleted: deepin-control-center/repos/community-i686/PKGBUILD deepin-control-center/repos/community-i686/fix-disable-sys-update.patch deepin-control-center/repos/community-x86_64/PKGBUILD deepin-control-center/repos/community-x86_64/fix-disable-sys-update.patch -----------------------------------------------+ /PKGBUILD | 64 ++++++++++++++++++++++++ community-i686/PKGBUILD | 39 -------------- community-i686/fix-disable-sys-update.patch | 24 --------- community-x86_64/PKGBUILD | 39 -------------- community-x86_64/fix-disable-sys-update.patch | 24 --------- 5 files changed, 64 insertions(+), 126 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-10-26 07:55:42 UTC (rev 264424) +++ community-i686/PKGBUILD 2017-10-26 07:56:19 UTC (rev 264425) @@ -1,39 +0,0 @@ -# $Id$ -# 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=4.2.5.11 -pkgrel=1 -pkgdesc='New control center for linux deepin' -arch=('i686' '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' - 'deepin-qt-dbus-factory' 'deepin-qt5integration') -makedepends=('deepin-dock' 'qt5-tools') -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" - fix-disable-sys-update.patch) -sha512sums=('25a0a59916dc8747babaf4ed828c99b90867529c648c24496324d31fc9ad71e6a84dab8a561810dc56f51b1ff4baa9e8187c41ecfed04ebbf31fcf2b0d4ff1f8' - '119b4d6ad6cac8aa5f71a30f12180987f8c613987c055f185f24b3f8c0184828d2e46bf5edb74fd1c8a3c2a6d677aabfcf113e999aa9d78732823cca0de1db5b') - -prepare() { - cd dde-control-center-$pkgver - patch -p1 -i ../fix-disable-sys-update.patch -} - -build() { - cd dde-control-center-$pkgver - qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES - make -} - -package() { - cd dde-control-center-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-control-center/repos/community-i686/PKGBUILD (from rev 264424, deepin-control-center/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-10-26 07:56:19 UTC (rev 264425) @@ -0,0 +1,32 @@ +# $Id$ +# 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=4.2.5.12 +pkgrel=1 +pkgdesc='New control center for linux deepin' +arch=('i686' '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' + 'deepin-qt-dbus-factory' 'deepin-qt5integration') +makedepends=('deepin-dock' 'qt5-tools') +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") +sha512sums=('94b8a8e4f82b0e27fc8709e1d8b4548fb8856ae3bf1b2bf4e7911963c474d6532ac86ff36e87b113bd375d4c28a8319a437c31437c1280851ffb20af5241b777') + +build() { + cd dde-control-center-$pkgver + qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES + make +} + +package() { + cd dde-control-center-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: community-i686/fix-disable-sys-update.patch =================================================================== --- community-i686/fix-disable-sys-update.patch 2017-10-26 07:55:42 UTC (rev 264424) +++ community-i686/fix-disable-sys-update.patch 2017-10-26 07:56:19 UTC (rev 264425) @@ -1,24 +0,0 @@ -commit 19a33aa0fb69cb66567dce3e86565ca1f422b177 -Author: Felix Yan <felixonm...@archlinux.org> -Date: Wed Oct 25 22:18:56 2017 +0800 - - fix: build with DISABLE_SYS_UPDATE specified - - Change-Id: Ib744235d7809624fca7409ef9c445dded1158ba2 - -diff --git a/frame/mainwidget.cpp b/frame/mainwidget.cpp -index c4d88be2..61f1d1eb 100644 ---- a/frame/mainwidget.cpp -+++ b/frame/mainwidget.cpp -@@ -246,7 +246,11 @@ void MainWidget::refershTimedate() - - void MainWidget::updateMPRISEnable() - { -+#ifndef DISABLE_SYS_UPDATE - const bool update_visible = m_updateNotifier->isVisible(); -+#else -+ const bool update_visible = false; -+#endif - const bool is_768 = qApp->primaryScreen()->geometry().height() == 768; - - m_quickSettingsPanel->setMPRISEnable(!(update_visible && is_768)); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-10-26 07:55:42 UTC (rev 264424) +++ community-x86_64/PKGBUILD 2017-10-26 07:56:19 UTC (rev 264425) @@ -1,39 +0,0 @@ -# $Id$ -# 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=4.2.5.11 -pkgrel=1 -pkgdesc='New control center for linux deepin' -arch=('i686' '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' - 'deepin-qt-dbus-factory' 'deepin-qt5integration') -makedepends=('deepin-dock' 'qt5-tools') -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" - fix-disable-sys-update.patch) -sha512sums=('25a0a59916dc8747babaf4ed828c99b90867529c648c24496324d31fc9ad71e6a84dab8a561810dc56f51b1ff4baa9e8187c41ecfed04ebbf31fcf2b0d4ff1f8' - '119b4d6ad6cac8aa5f71a30f12180987f8c613987c055f185f24b3f8c0184828d2e46bf5edb74fd1c8a3c2a6d677aabfcf113e999aa9d78732823cca0de1db5b') - -prepare() { - cd dde-control-center-$pkgver - patch -p1 -i ../fix-disable-sys-update.patch -} - -build() { - cd dde-control-center-$pkgver - qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES - make -} - -package() { - cd dde-control-center-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 264424, deepin-control-center/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-10-26 07:56:19 UTC (rev 264425) @@ -0,0 +1,32 @@ +# $Id$ +# 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=4.2.5.12 +pkgrel=1 +pkgdesc='New control center for linux deepin' +arch=('i686' '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' + 'deepin-qt-dbus-factory' 'deepin-qt5integration') +makedepends=('deepin-dock' 'qt5-tools') +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") +sha512sums=('94b8a8e4f82b0e27fc8709e1d8b4548fb8856ae3bf1b2bf4e7911963c474d6532ac86ff36e87b113bd375d4c28a8319a437c31437c1280851ffb20af5241b777') + +build() { + cd dde-control-center-$pkgver + qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES + make +} + +package() { + cd dde-control-center-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: community-x86_64/fix-disable-sys-update.patch =================================================================== --- community-x86_64/fix-disable-sys-update.patch 2017-10-26 07:55:42 UTC (rev 264424) +++ community-x86_64/fix-disable-sys-update.patch 2017-10-26 07:56:19 UTC (rev 264425) @@ -1,24 +0,0 @@ -commit 19a33aa0fb69cb66567dce3e86565ca1f422b177 -Author: Felix Yan <felixonm...@archlinux.org> -Date: Wed Oct 25 22:18:56 2017 +0800 - - fix: build with DISABLE_SYS_UPDATE specified - - Change-Id: Ib744235d7809624fca7409ef9c445dded1158ba2 - -diff --git a/frame/mainwidget.cpp b/frame/mainwidget.cpp -index c4d88be2..61f1d1eb 100644 ---- a/frame/mainwidget.cpp -+++ b/frame/mainwidget.cpp -@@ -246,7 +246,11 @@ void MainWidget::refershTimedate() - - void MainWidget::updateMPRISEnable() - { -+#ifndef DISABLE_SYS_UPDATE - const bool update_visible = m_updateNotifier->isVisible(); -+#else -+ const bool update_visible = false; -+#endif - const bool is_768 = qApp->primaryScreen()->geometry().height() == 768; - - m_quickSettingsPanel->setMPRISEnable(!(update_visible && is_768));