Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-tv/xawtv/files: xawtv-3.95-pagemask-fix.patch
Date: Fri, 31 May 2013 15:30:41
Message-Id: 20130531153035.DB7462171D@flycatcher.gentoo.org
jer         13/05/31 15:30:35

  Modified:             xawtv-3.95-pagemask-fix.patch
  Log:
  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)

Revision  Changes    Path
1.2                  media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch?r1=1.1&r2=1.2

Index: xawtv-3.95-pagemask-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xawtv-3.95-pagemask-fix.patch	2 Mar 2007 17:26:49 -0000	1.1
+++ xawtv-3.95-pagemask-fix.patch	31 May 2013 15:30:35 -0000	1.2
@@ -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 @@
      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>