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

[Felix Yan]

    Date: Thursday, October 26, 2017 @ 07:55:42
  Author: felixonmars
Revision: 264424

upgpkg: deepin-control-center 4.2.5.12-1

Modified:
  deepin-control-center/trunk/PKGBUILD
Deleted:
  deepin-control-center/trunk/fix-disable-sys-update.patch

------------------------------+
 PKGBUILD                     |   13 +++----------
 fix-disable-sys-update.patch |   24 ------------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-26 07:55:28 UTC (rev 264423)
+++ PKGBUILD	2017-10-26 07:55:42 UTC (rev 264424)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=4.2.5.11
+pkgver=4.2.5.12
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('i686' 'x86_64')
@@ -17,16 +17,9 @@
 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')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz")
+sha512sums=('94b8a8e4f82b0e27fc8709e1d8b4548fb8856ae3bf1b2bf4e7911963c474d6532ac86ff36e87b113bd375d4c28a8319a437c31437c1280851ffb20af5241b777')
 
-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

Deleted: fix-disable-sys-update.patch
===================================================================
--- fix-disable-sys-update.patch	2017-10-26 07:55:28 UTC (rev 264423)
+++ fix-disable-sys-update.patch	2017-10-26 07:55:42 UTC (rev 264424)
@@ -1,24 +0,0 @@
-commit 19a33aa0fb69cb66567dce3e86565ca1f422b177
-Author: Felix Yan <felixonmars at 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));