new version of the patch, accepted upstream

(Portage version: 2.0.51.22-r1)

3 files changed, 17 insertions, 50 deletions

diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index 791227bfcc6b..aba82204e9ad 100644
--- a/media-plugins/xmms-imms/ChangeLog
+++ b/media-plugins/xmms-imms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-plugins/xmms-imms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.29 2005/05/21 21:31:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.30 2005/05/22 12:43:58 luckyduck Exp $
+
+  22 May 2005; Jan Brinkmann <luckyduck@gentoo.org> files/2.1.1-xorg.patch:
+  new version of the patch, accepted upstream
 
 *xmms-imms-2.1.1 (21 May 2005)
 
diff --git a/media-plugins/xmms-imms/Manifest b/media-plugins/xmms-imms/Manifest
index dd538a3523bd..314d86402981 100644
--- a/media-plugins/xmms-imms/Manifest
+++ b/media-plugins/xmms-imms/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bfe9d4548076e51a7d253391bcfa76b0 xmms-imms-2.0.3.ebuild 1338
 MD5 ac76f6974ef8f541696f9ad05c237b99 xmms-imms-2.1.1.ebuild 1363
 MD5 4a3f07f3a22b1b15358f8decc1e4c75e xmms-imms-2.0.2.ebuild 1338
-MD5 f988a57109e42e23a9b698378fa66a65 ChangeLog 4731
+MD5 80c43f2755d9b5f34bec35e53fd4ef48 ChangeLog 4854
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 bcde683a9a9163bd75cb3db3d763d735 files/2.1.1-xorg.patch 988
+MD5 b635e4c80bb35a3474138dc317541714 files/2.1.1-xorg.patch 442
 MD5 3d1f3a0eb7144d8230e55f5968e0cd96 files/digest-xmms-imms-2.0.2 62
 MD5 5c71298a389ce9bcee576b62ef169c59 files/digest-xmms-imms-2.0.3 62
 MD5 b0477768a83c635b2cc2cc6a48bcc17c files/digest-xmms-imms-2.1.1 62
 MD5 49ca58eddd51ca3315cbb1c12a4ceff6 files/2.0.2-xorg.patch 383
 MD5 e5403b0fc1232e7de884fe7af6d709e0 files/2.0.3-xorg.patch 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCj6ip06ebR+OMO78RAsBAAJ0VRfluDs5X+DeureG+Sw2xABlkEwCeLFBN
-MBTMW7+Yj0JNwg1HkMbQAiw=
-=z9TD
------END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-imms/files/2.1.1-xorg.patch b/media-plugins/xmms-imms/files/2.1.1-xorg.patch
index b4a6a69b37a1..a14548772c50 100644
--- a/media-plugins/xmms-imms/files/2.1.1-xorg.patch
+++ b/media-plugins/xmms-imms/files/2.1.1-xorg.patch
@@ -1,37 +1,11 @@
-diff -uprN imms-2.1.1.orig/immscore/xidle.h imms-2.1.1/immscore/xidle.h
---- imms-2.1.1.orig/immscore/xidle.h	2005-05-21 23:00:33.000000000 +0200
-+++ imms-2.1.1/immscore/xidle.h	2005-05-21 23:10:44.000000000 +0200
-@@ -4,9 +4,7 @@
- #include "immsconf.h"
- 
- #include <time.h>
--#ifdef WITH_XSCREENSAVER
--# include <X11/Xlib.h>
--#endif
-+#include <X11/Xlib.h>
- 
- class XIdle
- {
-@@ -27,11 +25,9 @@ private:
-     int active;
-     time_t last_checked;
- 
--#ifdef WITH_XSCREENSAVER
-     Display *display;
-     Screen *screen;
-     Window root;
--#endif
- 
-     unsigned int prev_mask;
-     int prev_rootX, prev_rootY;
-diff -uprN imms-2.1.1.orig/vars.mk.in imms-2.1.1/vars.mk.in
---- imms-2.1.1.orig/vars.mk.in	2005-05-21 23:00:33.000000000 +0200
-+++ imms-2.1.1/vars.mk.in	2005-05-21 23:00:55.000000000 +0200
-@@ -24,6 +24,6 @@ CXXFLAGS=@CXXFLAGS@ -fno-rtti
- 
- GLIB2LDFLAGS=`pkg-config glib-2.0 --libs`
- GLIB1LDFLAGS=`pkg-config glib --libs`
--LDFLAGS=-L. @LIBS@
-+LDFLAGS=-lX11 -L. @LIBS@
- 
- default: all
+--- configure.ac.orig	2005-05-22 13:07:18.000000000 +0200
++++ configure.ac	2005-05-22 13:12:47.000000000 +0200
+@@ -193,7 +193,7 @@
+ fi
+ 
+ if test "$with_screensaver" != "no"; then
+-    LDFLAGS="-shared -L/usr/X11R6/lib"
++    LDFLAGS="-L/usr/X11R6/lib"
+     AC_CHECK_LIB(X11, XFlush,, [with_screensaver=no])
+     AC_CHECK_LIB(Xext, XextFindDisplay,, [with_screensaver=no])
+     AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,, [with_screensaver=no])