Fix compatibility with gtk+-2.14, bug 238734

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 35 insertions, 4 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/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 3fb7429a9e3d..af9c9b0021f0 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,4 +1,5 @@
 AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
+AUX gnome-screensaver-2.22.2-fix-copy-themes-include.patch 566 RMD160 ebcac26112014e9465a6b706d40ab345f1c40c73 SHA1 9d05b510248f71c3deee0cb98225eaed1f1d0f2e SHA256 bee314d9a2a6c0e7fdd7fd2c26ea7c8d8525e6fe14283e3db47ad34cc868f95a
 AUX gnome-screensaver-CVE-2008-0887.patch 7965 RMD160 9eade48b04e5a617ec427258f3e41d5c33ab750f SHA1 392a477755562b032d24928ac6c2100af7d7fca1 SHA256 71e9bb7735fbc373ee2f19f7740ba759c7eeff0e46bd50ab7401f9d6147a1666
 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
 DIST gnome-screensaver-2.20.0.tar.bz2 2013842 RMD160 ddea3d536366aab572462f4f66c72daabbeeb119 SHA1 0b99de04caf897642338c61edc12cb7cea27e0a4 SHA256 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
@@ -7,6 +8,6 @@ DIST gnome-screensaver-2.22.2.tar.bz2 2042396 RMD160 91f57c339fdc025588101b7fbab
 EBUILD gnome-screensaver-2.20.0-r2.ebuild 2975 RMD160 7cfec93dc5eb9ee7b125c96fd114b6cbbd24340f SHA1 3a1e8dc73d7545ff875f31cdc837ed9527c4150d SHA256 ff550c8d12af56aaead39dfa95c77ab9bca39af56180bb588fa404a15d1d3791
 EBUILD gnome-screensaver-2.20.0-r3.ebuild 3064 RMD160 e540f2068f42fdc67df6453b3626bf0135ba39fe SHA1 fae8399b77b851e02088236d49b88ba42db194ef SHA256 ec59d2bd23d9bd57c976ccb9f3d0165d815ec1fd8deaa7d4de18071f75162a64
 EBUILD gnome-screensaver-2.22.0-r1.ebuild 3082 RMD160 6da07d4f6dda3b76062c2adc10cd0ad41d1bd218 SHA1 ffd6ae9a512045a5e7a5298a49bd05cdb007aba8 SHA256 9eb68484814a06adb1e483a5b4e78f60d292b99b0786c48b85bd97809db216fe
-EBUILD gnome-screensaver-2.22.2.ebuild 3060 RMD160 13d58283be159cfe5d676f791bcd8b8f4455cdad SHA1 d9a181c0d85f2faac1e63303ebec373cabd808a5 SHA256 f0703889bc1d1664b24ff15b535d9e3650497358d429862e61574a6fae98c2c2
-MISC ChangeLog 12851 RMD160 fff43fabbadb0b19c9b50b86b10b852e33786886 SHA1 b6d0a610d244163c5c9ec577caeca962d2c41102 SHA256 8b7cd37d5955ee470220e52f01c7df3b492ef3568623673bcd9f1b209328f1de
+EBUILD gnome-screensaver-2.22.2.ebuild 3155 RMD160 06b09a67788564eec38877b62da4835e20def4ac SHA1 af25a55fd25a9ab3a73f1fb0f0eb67b6c51bf353 SHA256 4b14dfb40ecf9dad55fd85bef97fe09fdc80fc1636d6e217e51d3ecab3b8c6d3
+MISC ChangeLog 13047 RMD160 58ad0b9660df92ac26e714aa19517f1b7b2eeb44 SHA1 77ea8ca1a1d306f9c3ff9e4bcefb99abdc53eb23 SHA256 6cc4cef37df959fbf632e3a30326798f7d6d187dce5540c0ecb170c561e5998b
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
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() {