diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-07 09:27:50 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-07 09:27:50 +0000 |
| commit | dc1b568561b9a926ff5686e8ea732e53c3d61ec3 (patch) | |
| tree | 8ecdc09a3d56465e91e510830eecde749967f820 /gnome-extra | |
| parent | Add missing app-text/docbook-xml-dtd:4.1.2 DEPEND (bug #357669 by zvasylv). (diff) | |
| download | gentoo-2-dc1b568561b9a926ff5686e8ea732e53c3d61ec3.tar.gz gentoo-2-dc1b568561b9a926ff5686e8ea732e53c3d61ec3.tar.bz2 gentoo-2-dc1b568561b9a926ff5686e8ea732e53c3d61ec3.zip | |
Fix building with libnotify-0.7
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
3 files changed, 36 insertions, 3 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index 9b367aecf69e..4d071024b07b 100644 --- a/gnome-extra/gnome-screensaver/ChangeLog +++ b/gnome-extra/gnome-screensaver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-screensaver # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.132 2011/01/30 18:55:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.133 2011/03/07 09:27:50 nirbheek Exp $ + + 07 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + gnome-screensaver-2.30.2.ebuild, + +files/gnome-screensaver-2.30.2-libnotify-0.7.patch: + Fix building with libnotify-0.7 30 Jan 2011; Raúl Porcel <armin76@gentoo.org> gnome-screensaver-2.30.2.ebuild: diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-libnotify-0.7.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-libnotify-0.7.patch new file mode 100644 index 000000000000..6ea23ff9350e --- /dev/null +++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-libnotify-0.7.patch @@ -0,0 +1,25 @@ +--- src/gs-lock-plug.c ++++ src/gs-lock-plug.c +@@ -47,6 +47,10 @@ + #include <libnotify/notify.h> + #endif + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "gs-lock-plug.h" + + #include "gs-debug.h" +@@ -1090,7 +1094,11 @@ + strftime (summary, 128, "%X", tmp); + + notify_init ("gnome-screensaver-dialog"); ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ note = notify_notification_new (summary, escaped_text, NULL); ++#else + note = notify_notification_new (summary, escaped_text, NULL, NULL); ++#endif + notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER); + notify_notification_show (note, NULL); + g_object_unref (note); diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild index fd1c13ca63b2..b8ac3dcdd54e 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.5 2011/01/30 18:55:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.6 2011/03/07 09:27:50 nirbheek Exp $ EAPI="2" @@ -63,11 +63,14 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare + # libnotify support was removed from trunk, so not needed for next release + epatch "${FILESDIR}/${P}-libnotify-0.7.patch" # Fix intltoolize broken file, see upstream #577133 sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ || die "sed failed" + + gnome2_src_prepare } src_install() { |