Date: Wednesday, July 11, 2018 @ 07:30:21 Author: felixonmars Revision: 356958
upgpkg: deepin-notifications 3.3.4-2 add a patch to fix crashes Added: deepin-notifications/trunk/fix-crash.patch Modified: deepin-notifications/trunk/PKGBUILD -----------------+ PKGBUILD | 13 ++++++++++--- fix-crash.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-07-11 07:28:29 UTC (rev 356957) +++ PKGBUILD 2018-07-11 07:30:21 UTC (rev 356958) @@ -5,7 +5,7 @@ pkgname=deepin-notifications pkgver=3.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="System notifications for linuxdeepin desktop environment" arch=('x86_64') url="https://github.com/linuxdeepin/deepin-notifications" @@ -13,9 +13,16 @@ depends=('deepin-qt5integration' 'qt5-svg' 'qt5-declarative') provides=('notification-daemon') groups=('deepin') -source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/deepin-notifications/archive/$pkgver.tar.gz") -sha512sums=('324aa2109a2f2f983e0ea6f0ae5278cbfb557eab3771b89501b4ac2bf1840d3b051f8f6a046e378d6dcb30f4ab5b0e4ebe0ce6ce786cf07270b92efecdec3597') +source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/deepin-notifications/archive/$pkgver.tar.gz" + fix-crash.patch) +sha512sums=('324aa2109a2f2f983e0ea6f0ae5278cbfb557eab3771b89501b4ac2bf1840d3b051f8f6a046e378d6dcb30f4ab5b0e4ebe0ce6ce786cf07270b92efecdec3597' + 'a5a37e7df5d772f02c072d6519148920c450cce3cd47b6526f3870953c49f2de517b5d7add4738e20bc748e45dcfc13c64a7aa30861fb0b6c7b914ca35893318') +prepare() { + cd deepin-notifications-$pkgver/src + patch -p3 -i "$srcdir"/fix-crash.patch +} + build() { cd deepin-notifications-$pkgver qmake-qt5 PREFIX=/usr Added: fix-crash.patch =================================================================== --- fix-crash.patch (rev 0) +++ fix-crash.patch 2018-07-11 07:30:21 UTC (rev 356958) @@ -0,0 +1,33 @@ +From e92ce8b06b298622253fe2a55b2fa524aa342914 Mon Sep 17 00:00:00 2001 +From: haruyukilxz <l...@ilxz.me> +Date: Wed, 11 Jul 2018 13:07:23 +0800 +Subject: [PATCH] fix(osd): null pointer exception notify + +Change-Id: I082595e578839700117e006f344e948ce125e131 +--- + +diff --git a/dde-osd/notification/bubble.cpp b/dde-osd/notification/bubble.cpp +index 3998e37..46f16e7 100644 +--- a/dde-osd/notification/bubble.cpp ++++ b/dde-osd/notification/bubble.cpp +@@ -175,6 +175,8 @@ + { + DBlurEffectWidget::hideEvent(event); + ++ m_outAnimation->stop(); ++ + m_quitTimer->start(); + } + +@@ -210,7 +212,10 @@ + + void Bubble::onOutAnimFinished() + { +- Q_EMIT expired(m_entity->id().toInt()); ++ // FIXME: There should be no empty pointers here ++ if (m_entity) { ++ Q_EMIT expired(m_entity->id().toInt()); ++ } + } + + void Bubble::updateContent()