diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-17 23:13:20 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-17 23:13:20 +0000 |
| commit | d27b8908aee42e88314138c1b74de86df4675d19 (patch) | |
| tree | e69838ca4cbc12b200326555a8a4973e1da59733 /x11-plugins/wmsound | |
| parent | New version for GNOME 2.24. tiny mini changes. (diff) | |
| download | gentoo-2-d27b8908aee42e88314138c1b74de86df4675d19.tar.gz gentoo-2-d27b8908aee42e88314138c1b74de86df4675d19.tar.bz2 gentoo-2-d27b8908aee42e88314138c1b74de86df4675d19.zip | |
Fix patch with absolute paths.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'x11-plugins/wmsound')
| -rw-r--r-- | x11-plugins/wmsound/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmsound/files/wmsound-esd.patch | 58 |
2 files changed, 31 insertions, 35 deletions
diff --git a/x11-plugins/wmsound/ChangeLog b/x11-plugins/wmsound/ChangeLog index f33f10369a13..f61775b2150f 100644 --- a/x11-plugins/wmsound/ChangeLog +++ b/x11-plugins/wmsound/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmsound -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.6 2006/10/27 08:49:38 s4t4n Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.7 2008/11/17 23:13:19 flameeyes Exp $ + + 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> + files/wmsound-esd.patch: + Fix patch with absolute paths. 27 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmsound-0.9.5.ebuild: Added missing imake dependancy. Closes bug #150659. diff --git a/x11-plugins/wmsound/files/wmsound-esd.patch b/x11-plugins/wmsound/files/wmsound-esd.patch index 787c7a19e127..247e41dfc614 100644 --- a/x11-plugins/wmsound/files/wmsound-esd.patch +++ b/x11-plugins/wmsound/files/wmsound-esd.patch @@ -1,5 +1,5 @@ ---- /home/users/hunter/backups/Imakefile~ 2004-02-08 18:54:15.000000000 +0100 -+++ src/Imakefile 2004-02-08 18:54:48.000000000 +0100 +--- a/src/Imakefile~ 2004-02-08 18:54:15.000000000 +0100 ++++ b/src/Imakefile 2004-02-08 18:54:48.000000000 +0100 @@ -12,7 +12,7 @@ #endif @@ -9,8 +9,17 @@ WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB) ---- /home/users/hunter/backups/Imakefile~ 1999-05-02 12:27:29.000000000 +0200 -+++ lib/Imakefile 2004-02-08 19:16:56.000000000 +0100 +--- a/lib/Imakefile~ 1999-05-02 12:27:29.000000000 +0200 ++++ b/lib/Imakefile 2004-02-08 19:16:56.000000000 +0100 +@@ -4,7 +4,7 @@ + HEADER_INST = /include + + XCOMM Xfree86 +-STD_INCLUDES = -I/usr/X11R6/include -I/usr/local/include ++STD_INCLUDES = -I/usr/X11R6/include -I/usr/include + + XCOMM Solaris + XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include @@ -20,7 +20,7 @@ EXTRA_DEFINES = -DOSS_SOUND @@ -20,8 +29,8 @@ XCOMM uncomment out the next line if you want Solaris Support XCOMM EXTRA_DEFINES = -DSVR4 ---- /home/users/hunter/backups/Imakefile~ 1999-05-01 16:52:46.000000000 +0200 -+++ Imakefile 2004-02-08 19:18:47.000000000 +0100 +--- a/Imakefile~ 1999-05-01 16:52:46.000000000 +0200 ++++ b/Imakefile 2004-02-08 19:18:47.000000000 +0100 @@ -1,7 +1,7 @@ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -31,22 +40,14 @@ DESTDIR = $(PREFIX) ---- /home/users/hunter/backups/Imakefile~ 2004-02-08 19:19:18.000000000 +0100 -+++ lib/Imakefile 2004-02-08 19:20:04.000000000 +0100 -@@ -4,7 +4,7 @@ - HEADER_INST = /include - - XCOMM Xfree86 --STD_INCLUDES = -I/usr/X11R6/include -I/usr/local/include -+STD_INCLUDES = -I/usr/X11R6/include -I/usr/include +--- a/utils/Imakefile~ 1999-05-01 11:46:31.000000000 +0200 ++++ b/utils/Imakefile 2004-02-08 19:22:03.000000000 +0100 +@@ -11,10 +11,10 @@ + #endif - XCOMM Solaris - XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include ---- /home/users/hunter/backups/Imakefile~ 1999-05-01 11:46:31.000000000 +0200 -+++ utils/Imakefile 2004-02-08 19:22:03.000000000 +0100 -@@ -13,8 +13,8 @@ XCOMM uncomment out the next line if you want to use esd comment out the line below next line - XCOMM ESDLIB = -lesd -laudiofile +-XCOMM ESDLIB = -lesd -laudiofile ++ESDLIB = -lesd -laudiofile -WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB) -STD_INCLUDES = -I/usr/local/include -I/usr/X11R6/include @@ -55,8 +56,8 @@ DEPLIBS = $(DEPXLIB) LOCAL_LIBRARIES += -lPropList $(XLIB) $(WMSOUNDLIB) $(EFENCELIB) ---- /home/users/hunter/backups/Imakefile~ 2004-02-08 19:25:30.000000000 +0100 -+++ lib/Imakefile 2004-02-08 19:26:20.000000000 +0100 +--- a/lib/Imakefile~ 2004-02-08 19:25:30.000000000 +0100 ++++ b/lib/Imakefile 2004-02-08 19:26:20.000000000 +0100 @@ -9,7 +9,7 @@ XCOMM Solaris XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include @@ -66,14 +67,5 @@ #ifdef USE_HPUX_SOUND_SERVER EXTRA_INCLUDES += -I/opt/audio/include ---- /home/users/hunter/backups/Imakefile~ 2004-02-08 19:31:16.000000000 +0100 -+++ utils/Imakefile 2004-02-08 19:31:44.000000000 +0100 -@@ -11,7 +11,7 @@ - #endif - - XCOMM uncomment out the next line if you want to use esd comment out the line below next line --XCOMM ESDLIB = -lesd -laudiofile -+ESDLIB = -lesd -laudiofile - - WMSOUNDLIB = -L../lib -lwmsnd -L/usr/lib $(ESDLIB) - STD_INCLUDES = -I/usr/include -I/usr/X11R6/include +--- a/utils/Imakefile~ 2004-02-08 19:31:16.000000000 +0100 ++++ b/utils/Imakefile 2004-02-08 19:31:44.000000000 +0100 |