Date: Monday, February 29, 2016 @ 22:35:57 Author: jgc Revision: 260414
upgpkg: upower 0.99.4-2 Fix crash (FS#48341) Added: upower/trunk/fix-critical-action.patch Modified: upower/trunk/PKGBUILD ---------------------------+ PKGBUILD | 13 ++++++++++--- fix-critical-action.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-29 18:58:03 UTC (rev 260413) +++ PKGBUILD 2016-02-29 21:35:57 UTC (rev 260414) @@ -3,7 +3,7 @@ pkgname=upower pkgver=0.99.4 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -11,9 +11,16 @@ depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2') backup=('etc/UPower/UPower.conf') -source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0') +source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz + fix-critical-action.patch) +sha256sums=('9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0' + '30c9e7587bd63f75d50f50f93bf97d9a80fc76f5ce875080487de04b2538beb4') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../fix-critical-action.patch +} + build() { cd $pkgname-$pkgver Added: fix-critical-action.patch =================================================================== --- fix-critical-action.patch (rev 0) +++ fix-critical-action.patch 2016-02-29 21:35:57 UTC (rev 260414) @@ -0,0 +1,28 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.p...@ubuntu.com> +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +cgit v0.10.2 +