Date: Thursday, January 19, 2017 @ 10:57:43
Author: felixonmars
Revision: 208019
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-control-center/repos/community-i686/PKGBUILD
(from rev 208018, deepin-control-center/trunk/PKGBUILD)
deepin-control-center/repos/community-i686/disable-update.patch
(from rev 208018, deepin-control-center/trunk/disable-update.patch)
deepin-control-center/repos/community-x86_64/PKGBUILD
(from rev 208018, deepin-control-center/trunk/PKGBUILD)
deepin-control-center/repos/community-x86_64/disable-update.patch
(from rev 208018, deepin-control-center/trunk/disable-update.patch)
Deleted:
deepin-control-center/repos/community-i686/PKGBUILD
deepin-control-center/repos/community-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 78 ++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 31 ------------
community-i686/disable-update.patch | 34 +++++++++++++
community-x86_64/PKGBUILD | 31 ------------
community-x86_64/disable-update.patch | 34 +++++++++++++
5 files changed, 146 insertions(+), 62 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-19 10:57:02 UTC (rev 208018)
+++ community-i686/PKGBUILD 2017-01-19 10:57:43 UTC (rev 208019)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# 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=1
-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'
- '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";)
-sha256sums=('SKIP')
-
-build() {
- cd dde-control-center
- qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr WITH_MODULE_GRUB=NO
WITH_MODULE_REMOTE_ASSIST=NO WITH_MODULE_SYSINFO_UPDATE=NO
- make
-}
-
-package() {
- cd dde-control-center
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-control-center/repos/community-i686/PKGBUILD (from rev 208018,
deepin-control-center/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-19 10:57:43 UTC (rev 208019)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# 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/disable-update.patch (from
rev 208018, deepin-control-center/trunk/disable-update.patch)
===================================================================
--- community-i686/disable-update.patch (rev 0)
+++ community-i686/disable-update.patch 2017-01-19 10:57:43 UTC (rev 208019)
@@ -0,0 +1,34 @@
+From 8ed454a22637a21d29d2300874ac84b0d7ba4152 Mon Sep 17 00:00:00 2001
+From: Hualet Wang <[email protected]>
+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: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-19 10:57:02 UTC (rev 208018)
+++ community-x86_64/PKGBUILD 2017-01-19 10:57:43 UTC (rev 208019)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# 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=1
-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'
- '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";)
-sha256sums=('SKIP')
-
-build() {
- cd dde-control-center
- qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr WITH_MODULE_GRUB=NO
WITH_MODULE_REMOTE_ASSIST=NO WITH_MODULE_SYSINFO_UPDATE=NO
- make
-}
-
-package() {
- cd dde-control-center
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-control-center/repos/community-x86_64/PKGBUILD (from rev 208018,
deepin-control-center/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-19 10:57:43 UTC (rev 208019)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# 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/disable-update.patch (from
rev 208018, deepin-control-center/trunk/disable-update.patch)
===================================================================
--- community-x86_64/disable-update.patch (rev 0)
+++ community-x86_64/disable-update.patch 2017-01-19 10:57:43 UTC (rev
208019)
@@ -0,0 +1,34 @@
+From 8ed454a22637a21d29d2300874ac84b0d7ba4152 Mon Sep 17 00:00:00 2001
+From: Hualet Wang <[email protected]>
+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);
