diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-05-04 08:07:01 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-05-04 08:07:01 +0000 |
| commit | ffa579eea2465c519585e3f4cdc1976c93446c32 (patch) | |
| tree | c07e3a4fc13fad944ce52fbd6021330d80bc9b33 /sys-apps/systemd-ui | |
| parent | Version bump for the 3.2 series, remove old. (diff) | |
| download | gentoo-2-ffa579eea2465c519585e3f4cdc1976c93446c32.tar.gz gentoo-2-ffa579eea2465c519585e3f4cdc1976c93446c32.tar.bz2 gentoo-2-ffa579eea2465c519585e3f4cdc1976c93446c32.zip | |
Apply upstream fix to make it compatible with vala-0.24
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'sys-apps/systemd-ui')
| -rw-r--r-- | sys-apps/systemd-ui/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch | 35 | ||||
| -rw-r--r-- | sys-apps/systemd-ui/systemd-ui-3.ebuild | 7 |
3 files changed, 44 insertions, 4 deletions
diff --git a/sys-apps/systemd-ui/ChangeLog b/sys-apps/systemd-ui/ChangeLog index f5e3d2aeb899..e73726dbf776 100644 --- a/sys-apps/systemd-ui/ChangeLog +++ b/sys-apps/systemd-ui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd-ui # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/ChangeLog,v 1.9 2014/05/04 07:16:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/ChangeLog,v 1.10 2014/05/04 08:07:01 pacho Exp $ + + 04 May 2014; Pacho Ramos <pacho@gentoo.org> + +files/systemd-ui-3-vala-0.24.patch, systemd-ui-3.ebuild: + Apply upstream fix to make it compatible with vala-0.24 *systemd-ui-3 (04 May 2014) diff --git a/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch b/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch new file mode 100644 index 000000000000..ce5df6c75ce9 --- /dev/null +++ b/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch @@ -0,0 +1,35 @@ +From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001 +From: Michael Biebl <biebl@debian.org> +Date: Tue, 29 Apr 2014 20:20:51 +0000 +Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification' + +Notification is both defined by Notify and the latest GLib, resulting in +a build failure. Use Notify.Notification instead to avoid this +ambiguity. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130 +--- +diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala +index 571cd94..f3887dd 100644 +--- a/src/gnome-ask-password-agent.vala ++++ b/src/gnome-ask-password-agent.vala +@@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon { + string socket; + + PasswordDialog password_dialog; +- Notification n; ++ Notify.Notification n; + + public MyStatusIcon() throws GLib.Error { + GLib.Object(icon_name : "dialog-password"); +@@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon { + } + set_from_icon_name(icon); + +- n = new Notification(title, message, icon); ++ n = new Notify.Notification(title, message, icon); + n.set_timeout(5000); + n.closed.connect(() => { + set_visible(true); +-- +cgit v0.9.0.2-2-gbebe diff --git a/sys-apps/systemd-ui/systemd-ui-3.ebuild b/sys-apps/systemd-ui/systemd-ui-3.ebuild index 1c041952786b..c7e4b81db9c1 100644 --- a/sys-apps/systemd-ui/systemd-ui-3.ebuild +++ b/sys-apps/systemd-ui/systemd-ui-3.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-3.ebuild,v 1.1 2014/05/04 07:16:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-3.ebuild,v 1.2 2014/05/04 08:07:01 pacho Exp $ -EAPI=4 +EAPI=5 # Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5 VALA_MIN_API_VERSION=0.22 -VALA_MAX_API_VERSION=0.22 # fails with vala-0.24; should be fixed in >=systemd-ui-4 inherit autotools-utils systemd vala @@ -35,6 +34,8 @@ DEPEND="${RDEPEND} # Due to vala being broken. AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}/${P}-vala-0.24.patch" ) + src_prepare() { # Force the rebuild of .vala sources touch src/*.vala || die |