[arch-commits] Commit in deepin-control-center/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Monday, January 15, 2018 @ 08:08:20
  Author: felixonmars
Revision: 282572

archrelease: copy trunk to community-x86_64

Added:
  deepin-control-center/repos/community-x86_64/PKGBUILD
    (from rev 282571, deepin-control-center/trunk/PKGBUILD)
  deepin-control-center/repos/community-x86_64/disable-sys-update.patch
    (from rev 282571, deepin-control-center/trunk/disable-sys-update.patch)
Deleted:
  deepin-control-center/repos/community-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   73 ++++++++++++++++++++++++---------------------
 disable-sys-update.patch |   68 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-15 08:07:58 UTC (rev 282571)
+++ PKGBUILD	2018-01-15 08:08:20 UTC (rev 282572)
@@ -1,33 +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.3.7
-pkgrel=1
-pkgdesc='New control center for linux deepin'
-arch=('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')
-optdepends=('redshift: automatic color temperature support')
-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=('a8b1c3ca918ace88577e924ff66335d1ce7ddb2de55ce4abb160816a7cab8721188fa9a57bc97ddb1fc617d4a3f7df79b2f10a4ac2286eed0b3c98337b8b7777')
-
-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 282571, deepin-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-15 08:08:20 UTC (rev 282572)
@@ -0,0 +1,40 @@
+# $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.3.7
+pkgrel=2
+pkgdesc='New control center for linux deepin'
+arch=('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')
+optdepends=('redshift: automatic color temperature support')
+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"
+        disable-sys-update.patch)
+sha512sums=('a8b1c3ca918ace88577e924ff66335d1ce7ddb2de55ce4abb160816a7cab8721188fa9a57bc97ddb1fc617d4a3f7df79b2f10a4ac2286eed0b3c98337b8b7777'
+            'e968606156bea0c86c2c2baa4b936c785942e8c3a0de74aaa73b19ad505e3242d442c3276bbaed393e73cd88598daf6cc5356cea687f984b3966f01264f7028c')
+
+prepare() {
+  cd dde-control-center-$pkgver
+  patch -p1 -i ../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/disable-sys-update.patch (from rev 282571, deepin-control-center/trunk/disable-sys-update.patch)
===================================================================
--- disable-sys-update.patch	                        (rev 0)
+++ disable-sys-update.patch	2018-01-15 08:08:20 UTC (rev 282572)
@@ -0,0 +1,68 @@
+commit cc93d9525b1a9d64867e6cea1ba92097360a1aeb
+Author: haruyukilxz <kirigaya at mkacg.com>
+Date:   Mon Jan 15 13:21:49 2018 +0800
+
+    fix(navgation): Add compile macro
+    
+    Change-Id: I7686952a4f540c7c452bd85aa2e01f014fc327e6
+
+diff --git a/plugins/navgation/navgation.pro b/plugins/navgation/navgation.pro
+index 1215463b..88b22d18 100644
+--- a/plugins/navgation/navgation.pro
++++ b/plugins/navgation/navgation.pro
+@@ -27,3 +27,55 @@ INSTALLS += target
+ 
+ RESOURCES += \
+     resources.qrc
++
++isEqual(DISABLE_ACCOUNT, YES) {
++    DEFINES += DISABLE_ACCOUNT
++}
++
++isEqual(DISABLE_DISPALY, YES) {
++    DEFINES += DISABLE_DISPALY
++}
++
++isEqual(DISABLE_DEFAULT_APPLICATIONS, YES) {
++    DEFINES += DISABLE_DEFAULT_APPLICATIONS
++}
++
++isEqual(DISABLE_PERSONALIZATION, YES) {
++    DEFINES += DISABLE_PERSONALIZATION
++}
++
++isEqual(DISABLE_NETWORK, YES) {
++    DEFINES += DISABLE_NETWORK
++}
++
++isEqual(DISABLE_SOUND, YES) {
++    DEFINES += DISABLE_SOUND
++}
++
++isEqual(DISABLE_DATETIME, YES) {
++    DEFINES += DISABLE_DATETIME
++}
++
++isEqual(DISABLE_POWER, YES) {
++    DEFINES += DISABLE_POWER
++}
++
++isEqual(DISABLE_MOUSE, YES) {
++    DEFINES += DISABLE_MOUSE
++}
++
++isEqual(DISABLE_KAYBOARD, YES) {
++    DEFINES += DISABLE_KAYBOARD
++}
++
++isEqual(DISABLE_SYS_UPDATE, YES) {
++    DEFINES += DISABLE_SYS_UPDATE
++}
++
++isEqual(DISABLE_BLUETOOTH, YES) {
++    DEFINES += DISABLE_BLUETOOTH
++}
++
++isEqual(DISABLE_WACOM, YES) {
++    DEFINES += DISABLE_WACOM
++}