diff options
| author | Benoit Pierre | 2016-05-11 01:41:47 +0200 |
|---|---|---|
| committer | Benoit Pierre | 2016-05-11 15:27:40 +0200 |
| commit | ee3022d895777a6830871a690061c0adc6ac598d (patch) | |
| tree | 3022ae2689244112043ab80cdf4139c65be89c59 | |
| parent | 085aedaa9c2072f89e0f4c4972abdb04c93f504e (diff) | |
| download | aur-ee3022d895777a6830871a690061c0adc6ac598d.tar.gz | |
fix possible crash with pynotify
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | fix_wx_pynotify_crash.patch | 31 |
3 files changed, 49 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = plover pkgdesc = Free and open source real-time stenography engine. pkgver = 3.0.0 - pkgrel = 1 + pkgrel = 2 url = http://www.openstenoproject.org/plover/ arch = any license = GPL2 @@ -20,7 +20,9 @@ pkgbase = plover provides = plover conflicts = plover-git source = https://github.com/openstenoproject/plover/archive/v3.0.0.tar.gz + source = fix_wx_pynotify_crash.patch sha1sums = 89ca6af3fe002be218158930d105d25c1e1282be + sha1sums = b455b23628f0cc3b1bc290a3f55df901fbad8fc1 pkgname = plover @@ -3,7 +3,7 @@ pkgname=plover pkgdesc="Free and open source real-time stenography engine." pkgver=3.0.0 -pkgrel=1 +pkgrel=2 arch=('any') license=('GPL2') depends=( @@ -25,8 +25,20 @@ makedepends=( provides=('plover') conflicts=('plover-git') url="http://www.openstenoproject.org/plover/" -source=("https://github.com/openstenoproject/plover/archive/v$pkgver.tar.gz") -sha1sums=(89ca6af3fe002be218158930d105d25c1e1282be) +source=( + "https://github.com/openstenoproject/plover/archive/v$pkgver.tar.gz" + fix_wx_pynotify_crash.patch +) +sha1sums=( + 89ca6af3fe002be218158930d105d25c1e1282be + b455b23628f0cc3b1bc290a3f55df901fbad8fc1 +) + +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 -i ../fix_wx_pynotify_crash.patch +} check() { cd "$pkgname-$pkgver" diff --git a/fix_wx_pynotify_crash.patch b/fix_wx_pynotify_crash.patch new file mode 100644 index 000000000000..b793068af782 --- /dev/null +++ b/fix_wx_pynotify_crash.patch @@ -0,0 +1,31 @@ +commit 0f8e617b8f215561ec8a9d735d02bac8b27f602d +Author: Benoit Pierre <benoit.pierre@gmail.com> +Date: Wed May 11 15:04:16 2016 +0200 + + gui/log_dbus: fix possible crash + + pynotify uses gtk, and importing gtk before wx can trigger a crash: + see http://trac.wxwidgets.org/ticket/15898 + +diff --git a/plover/gui/log_dbus.py b/plover/gui/log_dbus.py +index c0a2e0f..fcc724a 100644 +--- a/plover/gui/log_dbus.py ++++ b/plover/gui/log_dbus.py +@@ -1,8 +1,15 @@ + +-from plover import log, __name__ as __software_name__ +-import pynotify + import logging + ++# Fix a possible crash... ++# See: http://trac.wxwidgets.org/ticket/15898 ++import gtk ++gtk.remove_log_handlers() ++ ++import pynotify ++ ++from plover import log, __name__ as __software_name__ ++ + + pynotify.init(__software_name__.capitalize()) + |