[arch-commits] Commit in deepin-control-center/trunk (PKGBUILD fix-crash.patch)

[Felix Yan]

    Date: Thursday, November 1, 2018 @ 11:16:58
  Author: felixonmars
Revision: 401071

upgpkg: deepin-control-center 4.7.2-1

Modified:
  deepin-control-center/trunk/PKGBUILD
Deleted:
  deepin-control-center/trunk/fix-crash.patch

-----------------+
 PKGBUILD        |   12 +++---------
 fix-crash.patch |   27 ---------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 11:15:18 UTC (rev 401070)
+++ PKGBUILD	2018-11-01 11:16:58 UTC (rev 401071)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-control-center
-pkgver=4.7.1
+pkgver=4.7.2
 pkgrel=1
 pkgdesc='New control center for linux deepin'
 arch=('x86_64')
@@ -17,15 +17,9 @@
 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=('808332f417cea435a8dbad2d13eacf6fefb22093efed50a6f0dbaae5ca7fab2a9cea34bd0d1a6ee2573b210d96d6690ecc58f30ae3271806de131b4b7dba8a2c'
-            'ee4d2ca70a5f418425fdc2eefe4286346d38d2685ac28c9dca490687c5d519442e9c5b5b45a4fdf747352d154f06fae9457a329bae3b4b1c39f8e584521526e0')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-control-center/archive/$pkgver.tar.gz")
+sha512sums=('f2c36a71ce1c6f395956595f94b2661a530456cb2fc53f11082c8005111c6d5982fbecc7b453c18a230eebee55d846f89a604b1e57627e7ce251f24647114d3d')
 
-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

Deleted: fix-crash.patch
===================================================================
--- fix-crash.patch	2018-11-01 11:15:18 UTC (rev 401070)
+++ fix-crash.patch	2018-11-01 11:16:58 UTC (rev 401071)
@@ -1,27 +0,0 @@
-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
- {