diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-17 22:58:49 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-17 22:58:49 +0000 |
| commit | 269fd228a0e370cffa6b1c1a98defcd7cd661823 (patch) | |
| tree | 7523f233324ba3cd628ef672ceb6f4aa3f4ea418 /sys-libs/libtrash | |
| parent | New version for GNOME 2.24. Dummy release. (diff) | |
| download | gentoo-2-269fd228a0e370cffa6b1c1a98defcd7cd661823.tar.gz gentoo-2-269fd228a0e370cffa6b1c1a98defcd7cd661823.tar.bz2 gentoo-2-269fd228a0e370cffa6b1c1a98defcd7cd661823.zip | |
Fix patch with absolute paths.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'sys-libs/libtrash')
| -rw-r--r-- | sys-libs/libtrash/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/libtrash/files/libtrash-2.4-gentoo.patch | 19 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog index 0736cd57b04f..2564ce7f3536 100644 --- a/sys-libs/libtrash/ChangeLog +++ b/sys-libs/libtrash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libtrash -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.11 2007/05/25 16:30:12 matsuu Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.12 2008/11/17 22:58:49 flameeyes Exp $ + + 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> + files/libtrash-2.4-gentoo.patch: + Fix patch with absolute paths. *libtrash-2.8 (25 May 2007) diff --git a/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch b/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch index e5e96f0b43d9..bc1074b9b5f9 100644 --- a/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch +++ b/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch @@ -1,7 +1,6 @@ -Only in ./: 01_all_libtrash-2.4-install-fix.patch -diff -ur /tmp/libtrash-2.4/cleanTrash/ct2.pl ./cleanTrash/ct2.pl ---- /tmp/libtrash-2.4/cleanTrash/ct2.pl 2003-12-07 14:11:49.000000000 -0500 -+++ ./cleanTrash/ct2.pl 2005-10-04 17:30:15.000000000 -0400 +diff -ur a/cleanTrash/ct2.pl ./cleanTrash/ct2.pl +--- a/cleanTrash/ct2.pl 2003-12-07 14:11:49.000000000 -0500 ++++ b/cleanTrash/ct2.pl 2005-10-04 17:30:15.000000000 -0400 @@ -39,7 +39,8 @@ ### CONFIGURATION ########################################################################## @@ -28,9 +27,9 @@ diff -ur /tmp/libtrash-2.4/cleanTrash/ct2.pl ./cleanTrash/ct2.pl ########################################################################## ### PROGRAM -diff -ur /tmp/libtrash-2.4/libtrash.conf ./libtrash.conf ---- /tmp/libtrash-2.4/libtrash.conf 2005-09-24 23:28:17.000000000 -0400 -+++ ./libtrash.conf 2005-10-04 17:10:30.000000000 -0400 +diff -ur a/libtrash.conf ./libtrash.conf +--- a/libtrash.conf 2005-09-24 23:28:17.000000000 -0400 ++++ b/libtrash.conf 2005-10-04 17:10:30.000000000 -0400 @@ -286,8 +286,8 @@ # through the use of the UNCOVER_DIRS environmental variable (see # below). @@ -51,9 +50,9 @@ diff -ur /tmp/libtrash-2.4/libtrash.conf ./libtrash.conf # This setting is meant to allow certain programs to function correctly -diff -ur /tmp/libtrash-2.4/src/Makefile ./src/Makefile ---- /tmp/libtrash-2.4/src/Makefile 2005-09-24 22:41:06.000000000 -0400 -+++ ./src/Makefile 2005-10-04 17:12:09.000000000 -0400 +diff -ur a/src/Makefile ./src/Makefile +--- a/src/Makefile 2005-09-24 22:41:06.000000000 -0400 ++++ b/src/Makefile 2005-10-04 17:12:09.000000000 -0400 @@ -1,8 +1,8 @@ CC=gcc CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT |