[arch-commits] Commit in deepin-control-center/repos (10 files)
Felix Yan
felixonmars at archlinux.org
Mon Feb 6 15:42:01 UTC 2017
Date: Monday, February 6, 2017 @ 15:42:00
Author: felixonmars
Revision: 210490
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-control-center/repos/community-i686/PKGBUILD
(from rev 210489, deepin-control-center/trunk/PKGBUILD)
deepin-control-center/repos/community-i686/disable-update.patch
(from rev 210489, deepin-control-center/trunk/disable-update.patch)
deepin-control-center/repos/community-i686/fix-focus.patch
(from rev 210489, deepin-control-center/trunk/fix-focus.patch)
deepin-control-center/repos/community-x86_64/PKGBUILD
(from rev 210489, deepin-control-center/trunk/PKGBUILD)
deepin-control-center/repos/community-x86_64/disable-update.patch
(from rev 210489, deepin-control-center/trunk/disable-update.patch)
deepin-control-center/repos/community-x86_64/fix-focus.patch
(from rev 210489, deepin-control-center/trunk/fix-focus.patch)
Deleted:
deepin-control-center/repos/community-i686/PKGBUILD
deepin-control-center/repos/community-i686/disable-update.patch
deepin-control-center/repos/community-x86_64/PKGBUILD
deepin-control-center/repos/community-x86_64/disable-update.patch
---------------------------------------+
/PKGBUILD | 82 ++++++++++++++++++++++++++++++++
/disable-update.patch | 68 ++++++++++++++++++++++++++
community-i686/PKGBUILD | 39 ---------------
community-i686/disable-update.patch | 34 -------------
community-i686/fix-focus.patch | 28 ++++++++++
community-x86_64/PKGBUILD | 39 ---------------
community-x86_64/disable-update.patch | 34 -------------
community-x86_64/fix-focus.patch | 28 ++++++++++
8 files changed, 206 insertions(+), 146 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-06 15:41:27 UTC (rev 210489)
+++ community-i686/PKGBUILD 2017-02-06 15:42:00 UTC (rev 210490)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-control-center
-pkgver=4.0.2
-pkgrel=2
-pkgdesc='New control center for linux deepin'
-arch=('i686' 'x86_64')
-url="http://github.com/linuxdeepin/dde-control-center"
-license=('GPL3')
-depends=('desktop-file-utils' 'deepin-tool-kit' 'deepin-account-faces' 'deepin-api' 'geoip'
- 'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde'
- 'deepin-qt-dbus-factory')
-makedepends=('deepin-dock' 'qt5-tools' 'git')
-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)
-sha256sums=('SKIP'
- '5e96faac28348a783d744955d0d3bd8b29a549ee5f4dbdad2a4671d531dbcce6')
-
-prepare() {
- cd dde-control-center
- patch -p1 -i ../disable-update.patch
-}
-
-build() {
- cd dde-control-center
- qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES
- make
-}
-
-package() {
- cd dde-control-center
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-control-center/repos/community-i686/PKGBUILD (from rev 210489, deepin-control-center/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-control-center
+pkgver=4.0.2
+pkgrel=3
+pkgdesc='New control center for linux deepin'
+arch=('i686' 'x86_64')
+url="http://github.com/linuxdeepin/dde-control-center"
+license=('GPL3')
+depends=('desktop-file-utils' 'deepin-tool-kit' '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' 'git')
+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')
+
+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
+ make
+}
+
+package() {
+ cd dde-control-center
+ make INSTALL_ROOT="${pkgdir}" install
+}
Deleted: community-i686/disable-update.patch
===================================================================
--- community-i686/disable-update.patch 2017-02-06 15:41:27 UTC (rev 210489)
+++ community-i686/disable-update.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -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);
Copied: deepin-control-center/repos/community-i686/disable-update.patch (from rev 210489, deepin-control-center/trunk/disable-update.patch)
===================================================================
--- community-i686/disable-update.patch (rev 0)
+++ community-i686/disable-update.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,34 @@
+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);
Copied: deepin-control-center/repos/community-i686/fix-focus.patch (from rev 210489, deepin-control-center/trunk/fix-focus.patch)
===================================================================
--- community-i686/fix-focus.patch (rev 0)
+++ community-i686/fix-focus.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,28 @@
+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())
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-06 15:41:27 UTC (rev 210489)
+++ community-x86_64/PKGBUILD 2017-02-06 15:42:00 UTC (rev 210490)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-control-center
-pkgver=4.0.2
-pkgrel=2
-pkgdesc='New control center for linux deepin'
-arch=('i686' 'x86_64')
-url="http://github.com/linuxdeepin/dde-control-center"
-license=('GPL3')
-depends=('desktop-file-utils' 'deepin-tool-kit' 'deepin-account-faces' 'deepin-api' 'geoip'
- 'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde'
- 'deepin-qt-dbus-factory')
-makedepends=('deepin-dock' 'qt5-tools' 'git')
-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)
-sha256sums=('SKIP'
- '5e96faac28348a783d744955d0d3bd8b29a549ee5f4dbdad2a4671d531dbcce6')
-
-prepare() {
- cd dde-control-center
- patch -p1 -i ../disable-update.patch
-}
-
-build() {
- cd dde-control-center
- qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr DISABLE_SYS_UPDATE=YES
- make
-}
-
-package() {
- cd dde-control-center
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 210489, deepin-control-center/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-control-center
+pkgver=4.0.2
+pkgrel=3
+pkgdesc='New control center for linux deepin'
+arch=('i686' 'x86_64')
+url="http://github.com/linuxdeepin/dde-control-center"
+license=('GPL3')
+depends=('desktop-file-utils' 'deepin-tool-kit' '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' 'git')
+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')
+
+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
+ make
+}
+
+package() {
+ cd dde-control-center
+ make INSTALL_ROOT="${pkgdir}" install
+}
Deleted: community-x86_64/disable-update.patch
===================================================================
--- community-x86_64/disable-update.patch 2017-02-06 15:41:27 UTC (rev 210489)
+++ community-x86_64/disable-update.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -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);
Copied: deepin-control-center/repos/community-x86_64/disable-update.patch (from rev 210489, deepin-control-center/trunk/disable-update.patch)
===================================================================
--- community-x86_64/disable-update.patch (rev 0)
+++ community-x86_64/disable-update.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,34 @@
+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);
Copied: deepin-control-center/repos/community-x86_64/fix-focus.patch (from rev 210489, deepin-control-center/trunk/fix-focus.patch)
===================================================================
--- community-x86_64/fix-focus.patch (rev 0)
+++ community-x86_64/fix-focus.patch 2017-02-06 15:42:00 UTC (rev 210490)
@@ -0,0 +1,28 @@
+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