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

Felix Yan felixonmars at archlinux.org
Mon Feb 20 10:20:38 UTC 2017


    Date: Monday, February 20, 2017 @ 10:20:37
  Author: felixonmars
Revision: 213184

upgpkg: deepin-control-center 4.0.3-1

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

----------------------+
 PKGBUILD             |   17 ++++-------------
 disable-update.patch |   34 ----------------------------------
 fix-focus.patch      |   28 ----------------------------
 3 files changed, 4 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-20 10:11:58 UTC (rev 213183)
+++ PKGBUILD	2017-02-20 10:20:37 UTC (rev 213184)
@@ -4,8 +4,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=4.0.2
-pkgrel=3
+pkgver=4.0.3
+pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('i686' 'x86_64')
 url="http://github.com/linuxdeepin/dde-control-center"
@@ -17,18 +17,9 @@
 conflicts=('dde-control-center' 'dde-dock-applets')
 replaces=('dde-control-center' 'dde-dock-applets')
 groups=('deepin')
-source=("git+https://cr.deepin.io/dde/dde-control-center.git#tag=$pkgver"
-        disable-update.patch fix-focus.patch)
-sha256sums=('SKIP'
-            '5e96faac28348a783d744955d0d3bd8b29a549ee5f4dbdad2a4671d531dbcce6'
-            '08801253ba5171c9eb83e6ecd25a25f567ab0c119487f964ed3b35e634c6e935')
+source=("git+https://cr.deepin.io/dde/dde-control-center.git#tag=$pkgver")
+sha256sums=('SKIP')
 
-prepare() {
-  cd dde-control-center
-  patch -p1 -i ../disable-update.patch
-  patch -p1 -i ../fix-focus.patch
-}
-
 build() {
   cd dde-control-center
   qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES

Deleted: disable-update.patch
===================================================================
--- disable-update.patch	2017-02-20 10:11:58 UTC (rev 213183)
+++ disable-update.patch	2017-02-20 10:20:37 UTC (rev 213184)
@@ -1,34 +0,0 @@
-From 8ed454a22637a21d29d2300874ac84b0d7ba4152 Mon Sep 17 00:00:00 2001
-From: Hualet Wang <mr.asianwang at gmail.com>
-Date: Thu, 19 Jan 2017 17:27:57 +0800
-Subject: [PATCH] Add option to disable udpate module
-
-Change-Id: Ib40bb92dc38a12f03f1c06f9a7f63a31e8f40b61
----
-
-diff --git a/frame/frame.pro b/frame/frame.pro
-index 41695b9..9f803ec 100644
---- a/frame/frame.pro
-+++ b/frame/frame.pro
-@@ -57,3 +57,7 @@
- 
- RESOURCES += \
-     frame.qrc
-+
-+isEqual(DISABLE_SYS_UPDATE, YES){
-+    DEFINES += DISABLE_SYS_UPDATE
-+}
-diff --git a/frame/settingswidget.cpp b/frame/settingswidget.cpp
-index ac75509..1a16c41 100644
---- a/frame/settingswidget.cpp
-+++ b/frame/settingswidget.cpp
-@@ -68,7 +68,9 @@
-     loadModule(new mouse::MouseModule(this));
-     loadModule(new KeyboardModule(this));
-     loadModule(new wacom::WacomModule(this));
-+#ifndef DISABLE_SYS_UPDATE
-     loadModule(new UpdateModule(this));
-+#endif
-     loadModule(new SystemInfoModule(this));
- 
-     m_settingsWidget->setLayout(m_settingsLayout);

Deleted: fix-focus.patch
===================================================================
--- fix-focus.patch	2017-02-20 10:11:58 UTC (rev 213183)
+++ fix-focus.patch	2017-02-20 10:20:37 UTC (rev 213184)
@@ -1,28 +0,0 @@
-commit c199fff7402f6872bf2f34c7a5648bd6e0e26d0f
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Mon Feb 6 23:09:48 2017 +0800
-
-    Fix focus problem in Arch
-    
-    According to Qt docs [1], Qt::X11BypassWindowManagerHint leads to "no
-    keyboard input unless you call QWidget::activateWindow() manually".
-    
-    Calling activateWindow() here fixes the focus problem [2] in Arch.
-    
-    [1] http://doc.qt.io/qt-5/qt.html
-    [2] https://github.com/linuxdeepin/developer-center/issues/156
-    
-    Change-Id: Ifc80b50d008a025ef68f760cfa2741f37a230989
-
-diff --git a/frame/frame.cpp b/frame/frame.cpp
-index acb2c351..ceef7fe6 100644
---- a/frame/frame.cpp
-+++ b/frame/frame.cpp
-@@ -220,6 +220,7 @@ void Frame::show()
- 
-     // show frame
-     QFrame::show();
-+    QFrame::activateWindow();
- 
-     // notify top widget appear
-     if (m_frameWidgetStack.last() && m_frameWidgetStack.last()->content())



More information about the arch-commits mailing list