summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-05-31 15:30:35 +0000
committerJeroen Roovers <jer@gentoo.org>2013-05-31 15:30:35 +0000
commit2024571a011a98b43f480b1bd8e8d18e237bfe97 (patch)
tree5c62215087a90fde63c6b866948f46b478576ebf /media-tv/xawtv
parentAdd USE dependency default in preparation for the removal of the semantic-des... (diff)
downloadgentoo-2-2024571a011a98b43f480b1bd8e8d18e237bfe97.tar.gz
gentoo-2-2024571a011a98b43f480b1bd8e8d18e237bfe97.tar.bz2
gentoo-2-2024571a011a98b43f480b1bd8e8d18e237bfe97.zip
Fix relative paths in patch (bug #471818 by Aaron Pelton).
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'media-tv/xawtv')
-rw-r--r--media-tv/xawtv/ChangeLog8
-rw-r--r--media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch10
2 files changed, 10 insertions, 8 deletions
diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 6dbe7e5bd1bf..90b1d281a5d8 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xawtv
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.68 2012/10/24 19:18:50 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.69 2013/05/31 15:30:35 jer Exp $
+
+ 31 May 2013; Jeroen Roovers <jer@gentoo.org>
+ files/xawtv-3.95-pagemask-fix.patch:
+ Fix relative paths in patch (bug #471818 by Aaron Pelton).
24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xawtv-3.95-r2.ebuild:
Update dependency after package move from x11-libs/openmotif to
diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
index ab635f73a9ac..7a1ff5e71f02 100644
--- a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
+++ b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
@@ -1,9 +1,8 @@
Patch from Andreas Jochens
http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html
-diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
---- ../tmp-orig/xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000
-+++ ./console/fbtools.c 2006-08-23 10:57:40.000000000 +0000
+--- a/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000
++++ b/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000
@@ -21,8 +21,6 @@
#include <linux/vt.h>
#include <linux/fb.h>
@@ -22,9 +21,8 @@ diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
if (-1L == (long)fb_mem) {
-diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c
---- ../tmp-orig/xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000
-+++ ./console/matrox.c 2006-08-23 11:09:51.000000000 +0000
+--- a/console/matrox.c 2005-02-03 10:40:41.000000000 +0000
++++ b/console/matrox.c 2006-08-23 11:09:51.000000000 +0000
@@ -9,7 +9,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>