diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2008-09-28 08:13:02 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2008-09-28 08:13:02 +0000 |
| commit | 2528b6878ac46e36c2de192960aab91a673239c1 (patch) | |
| tree | 418b2d4bce4292bccbe1e80c45ca8ee9491c3795 /gnome-extra/gnome-screensaver | |
| parent | keyword ~x86-fbsd (diff) | |
| download | gentoo-2-2528b6878ac46e36c2de192960aab91a673239c1.tar.gz gentoo-2-2528b6878ac46e36c2de192960aab91a673239c1.tar.bz2 gentoo-2-2528b6878ac46e36c2de192960aab91a673239c1.zip | |
Fix compatibility with gtk+-2.14, bug 238734
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'gnome-extra/gnome-screensaver')
3 files changed, 32 insertions, 2 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index b3d9a72a3331..8ea87d99c085 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.82 2008/09/25 15:04:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.83 2008/09/28 08:13:01 leio Exp $ + + 28 Sep 2008; Mart Raudsepp <leio@gentoo.org> + +files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch, + gnome-screensaver-2.22.2.ebuild: + Fix compatibility with gtk+-2.14, bug 238734 25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gnome-screensaver-2.22.2.ebuild: diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch new file mode 100644 index 000000000000..6bc92a1cae44 --- /dev/null +++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch @@ -0,0 +1,22 @@ +Retrieved from http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/copy-theme-dialog.c?r1=1357&r2=1462&view=patch +Fixes build compatibility against gtk+-2.14 + +--- trunk/src/copy-theme-dialog.c 2008/01/31 03:10:09 1357 ++++ trunk/src/copy-theme-dialog.c 2008/07/03 13:17:17 1462 +@@ -21,12 +21,14 @@ + # include "config.h" + #endif + ++#include <sys/stat.h> ++#include <limits.h> ++#include <string.h> ++ + #include <glib.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> + #include <gio/gio.h> +-#include <limits.h> +-#include <string.h> + + #include "copy-theme-dialog.h" + diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild index f3687e980e85..c69db5021cf2 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.22.2.ebuild,v 1.6 2008/09/25 15:04:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild,v 1.7 2008/09/28 08:13:01 leio Exp $ inherit eutils gnome2 @@ -69,6 +69,9 @@ src_unpack() { # fix bug #201019 epatch "${FILESDIR}/${PN}-2.20.0-fix-gamma.patch" + + # Fix compatibility with gtk+-2.14 + epatch "${FILESDIR}/${P}-fix-copy-themes-include.patch" } src_install() { |