Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd-ui/files: systemd-ui-3-vala-0.24.patch
Date: Sun, 04 May 2014 08:07:03
Message-Id: 20140504080701.209512004C@flycatcher.gentoo.org
1 pacho 14/05/04 08:07:01
2
3 Added: systemd-ui-3-vala-0.24.patch
4 Log:
5 Apply upstream fix to make it compatible with vala-0.24
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
8
9 Revision Changes Path
10 1.1 sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch?rev=1.1&content-type=text/plain
14
15 Index: systemd-ui-3-vala-0.24.patch
16 ===================================================================
17 From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001
18 From: Michael Biebl <biebl@××××××.org>
19 Date: Tue, 29 Apr 2014 20:20:51 +0000
20 Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification'
21
22 Notification is both defined by Notify and the latest GLib, resulting in
23 a build failure. Use Notify.Notification instead to avoid this
24 ambiguity.
25
26 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130
27 ---
28 diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
29 index 571cd94..f3887dd 100644
30 --- a/src/gnome-ask-password-agent.vala
31 +++ b/src/gnome-ask-password-agent.vala
32 @@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon {
33 string socket;
34
35 PasswordDialog password_dialog;
36 - Notification n;
37 + Notify.Notification n;
38
39 public MyStatusIcon() throws GLib.Error {
40 GLib.Object(icon_name : "dialog-password");
41 @@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon {
42 }
43 set_from_icon_name(icon);
44
45 - n = new Notification(title, message, icon);
46 + n = new Notify.Notification(title, message, icon);
47 n.set_timeout(5000);
48 n.closed.connect(() => {
49 set_visible(true);
50 --
51 cgit v0.9.0.2-2-gbebe