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

[Felix Yan]

    Date: Thursday, October 25, 2018 @ 15:35:00
  Author: felixonmars
Revision: 399000

archrelease: copy trunk to community-x86_64

Added:
  deepin-control-center/repos/community-x86_64/PKGBUILD
    (from rev 398999, deepin-control-center/trunk/PKGBUILD)
  deepin-control-center/repos/community-x86_64/fix-crash.patch
    (from rev 398999, deepin-control-center/trunk/fix-crash.patch)
Deleted:
  deepin-control-center/repos/community-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   70 +++++++++++++++++++++++++++++-------------------------
 fix-crash.patch |   27 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 32 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-25 15:34:40 UTC (rev 398999)
+++ PKGBUILD	2018-10-25 15:35:00 UTC (rev 399000)
@@ -1,32 +0,0 @@
-# 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.7.0
-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' 'networkmanager-qt'
-         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils')
-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=('f86c97ae232b4603cb1b9f87995733aca774cefcb73e57a5aaed06a5798d3813d7a6e8f2cb2cbb72129f2a064b390c1040996e436f0dc85f6c39aed8c326c92d')
-
-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 398999, deepin-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-25 15:35:00 UTC (rev 399000)
@@ -0,0 +1,38 @@
+# 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.7.0
+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' 'networkmanager-qt'
+         'deepin-qt-dbus-factory' 'deepin-qt5integration' 'deepin-network-utils')
+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"
+        fix-crash.patch)
+sha512sums=('f86c97ae232b4603cb1b9f87995733aca774cefcb73e57a5aaed06a5798d3813d7a6e8f2cb2cbb72129f2a064b390c1040996e436f0dc85f6c39aed8c326c92d'
+            'ee4d2ca70a5f418425fdc2eefe4286346d38d2685ac28c9dca490687c5d519442e9c5b5b45a4fdf747352d154f06fae9457a329bae3b4b1c39f8e584521526e0')
+
+prepare() {
+  patch -d dde-control-center-$pkgver -p1 -i ../fix-crash.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/fix-crash.patch (from rev 398999, deepin-control-center/trunk/fix-crash.patch)
===================================================================
--- fix-crash.patch	                        (rev 0)
+++ fix-crash.patch	2018-10-25 15:35:00 UTC (rev 399000)
@@ -0,0 +1,27 @@
+commit b2e9a0b181aebef867f61eadf02dcb01950ef9d9
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Oct 25 23:28:09 2018 +0800
+
+    fix: immediate segfault when sys update is disabled
+    
+    m_navWidget and m_notifyWidget were placed under the macro check, which
+    results in a segfault when later being added to m_pluginsLayout. Moving
+    them out of the macro fixes it.
+    
+    Change-Id: Ie6bbca787763af778d6410414f4c4f26ab287ed0
+
+diff --git a/frame/mainwidget.cpp b/frame/mainwidget.cpp
+index 0ef70954..1871aa03 100644
+--- a/frame/mainwidget.cpp
++++ b/frame/mainwidget.cpp
+@@ -55,9 +55,9 @@ MainWidget::MainWidget(FrameContentWrapper *parent)
+     , m_currentTimeLbl(new QLabel)
+     , m_currentDateLbl(new QLabel)
+     , m_pluginsLayout(new QStackedLayout)
+-#ifndef DISABLE_SYS_UPDATE
+     , m_navWidget(new NavWidget(this))
+     , m_notifyWidget(new NotifyWidget(this))
++#ifndef DISABLE_SYS_UPDATE
+     , m_updateNotifier(new UpdateNotifier)
+ #endif
+ {