From 7c49ba43ded743413e5dbf476e672ba22235512d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 15 Mar 2013 00:48:22 +0000
Subject: [PATCH] Fix qemacs CVS patch

For the record:
sed -i 's,^--- ,--- qemacs-0.3.2dev-cvs/,;s,^+++ ,+++ qemacs-0.3.2dev-cvs/,' app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch
---
 .../qemacs/patches/qemacs-0.3.2dev-cvs.patch  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch b/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch
index 221df31ba..c04011406 100644
--- a/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch
+++ b/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch
@@ -3,8 +3,8 @@ Index: Makefile
 RCS file: /sources/qemacs/qemacs/Makefile,v
 retrieving revision 1.50
 diff -u -r1.50 Makefile
---- Makefile	5 Jun 2008 07:14:12 -0000	1.50
-+++ Makefile	14 Mar 2013 23:32:46 -0000
+--- qemacs-0.3.2dev-cvs/Makefile	5 Jun 2008 07:14:12 -0000	1.50
++++ qemacs-0.3.2dev-cvs/Makefile	14 Mar 2013 23:32:46 -0000
 @@ -63,7 +63,7 @@
  endif
  
@@ -69,8 +69,8 @@ Index: cfb.c
 RCS file: /sources/qemacs/qemacs/cfb.c,v
 retrieving revision 1.8
 diff -u -r1.8 cfb.c
---- cfb.c	8 Apr 2008 06:55:44 -0000	1.8
-+++ cfb.c	14 Mar 2013 23:32:46 -0000
+--- qemacs-0.3.2dev-cvs/cfb.c	8 Apr 2008 06:55:44 -0000	1.8
++++ qemacs-0.3.2dev-cvs/cfb.c	14 Mar 2013 23:32:46 -0000
 @@ -50,7 +50,7 @@
  static void cfb16_fill_rectangle(QEditScreen *s,
                                   int x1, int y1, int w, int h, QEColor color)
@@ -130,8 +130,8 @@ Index: configure
 RCS file: /sources/qemacs/qemacs/configure,v
 retrieving revision 1.15
 diff -u -r1.15 configure
---- configure	17 Apr 2008 15:06:44 -0000	1.15
-+++ configure	14 Mar 2013 23:32:46 -0000
+--- qemacs-0.3.2dev-cvs/configure	17 Apr 2008 15:06:44 -0000	1.15
++++ qemacs-0.3.2dev-cvs/configure	14 Mar 2013 23:32:46 -0000
 @@ -45,9 +45,11 @@
  ptsname="yes"
  gprof="no"
@@ -215,8 +215,8 @@ Index: display.h
 RCS file: /sources/qemacs/qemacs/display.h,v
 retrieving revision 1.11
 diff -u -r1.11 display.h
---- display.h	11 Jan 2008 11:29:28 -0000	1.11
-+++ display.h	14 Mar 2013 23:32:46 -0000
+--- qemacs-0.3.2dev-cvs/display.h	11 Jan 2008 11:29:28 -0000	1.11
++++ qemacs-0.3.2dev-cvs/display.h	14 Mar 2013 23:32:46 -0000
 @@ -53,7 +53,7 @@
      int refcount;
      int ascent;
@@ -247,8 +247,8 @@ Index: fbfrender.c
 RCS file: /sources/qemacs/qemacs/fbfrender.c,v
 retrieving revision 1.10
 diff -u -r1.10 fbfrender.c
---- fbfrender.c	8 Jan 2008 16:37:54 -0000	1.10
-+++ fbfrender.c	14 Mar 2013 23:32:46 -0000
+--- qemacs-0.3.2dev-cvs/fbfrender.c	8 Jan 2008 16:37:54 -0000	1.10
++++ qemacs-0.3.2dev-cvs/fbfrender.c	14 Mar 2013 23:32:46 -0000
 @@ -124,7 +124,7 @@
  
  static GlyphCache *fbf_decode_glyph1(QEFont *font, int code)
@@ -272,8 +272,8 @@ Index: html2png.c
 RCS file: /sources/qemacs/qemacs/html2png.c,v
 retrieving revision 1.12
 diff -u -r1.12 html2png.c
---- html2png.c	11 Jan 2008 11:29:28 -0000	1.12
-+++ html2png.c	14 Mar 2013 23:32:47 -0000
+--- qemacs-0.3.2dev-cvs/html2png.c	11 Jan 2008 11:29:28 -0000	1.12
++++ qemacs-0.3.2dev-cvs/html2png.c	14 Mar 2013 23:32:47 -0000
 @@ -135,7 +135,7 @@
  /* realloc ppm bitmap */
  static int ppm_resize(QEditScreen *s, int w, int h)
@@ -334,8 +334,8 @@ Index: qe.h
 RCS file: /sources/qemacs/qemacs/qe.h,v
 retrieving revision 1.96
 diff -u -r1.96 qe.h
---- qe.h	4 May 2008 15:54:39 -0000	1.96
-+++ qe.h	14 Mar 2013 23:32:48 -0000
+--- qemacs-0.3.2dev-cvs/qe.h	4 May 2008 15:54:39 -0000	1.96
++++ qemacs-0.3.2dev-cvs/qe.h	14 Mar 2013 23:32:48 -0000
 @@ -267,11 +267,11 @@
  int ustristart(const unsigned int *str, const char *val, const unsigned int **ptr);
  static inline unsigned int *umemmove(unsigned int *dest,
@@ -355,8 +355,8 @@ Index: tty.c
 RCS file: /sources/qemacs/qemacs/tty.c,v
 retrieving revision 1.50
 diff -u -r1.50 tty.c
---- tty.c	23 Apr 2008 15:30:33 -0000	1.50
-+++ tty.c	14 Mar 2013 23:32:49 -0000
+--- qemacs-0.3.2dev-cvs/tty.c	23 Apr 2008 15:30:33 -0000	1.50
++++ qemacs-0.3.2dev-cvs/tty.c	14 Mar 2013 23:32:49 -0000
 @@ -118,7 +118,7 @@
  
      tty_screen = s;
@@ -451,8 +451,8 @@ Index: win32.c
 RCS file: /sources/qemacs/qemacs/win32.c,v
 retrieving revision 1.15
 diff -u -r1.15 win32.c
---- win32.c	23 Apr 2008 15:29:35 -0000	1.15
-+++ win32.c	14 Mar 2013 23:32:49 -0000
+--- qemacs-0.3.2dev-cvs/win32.c	23 Apr 2008 15:29:35 -0000	1.15
++++ qemacs-0.3.2dev-cvs/win32.c	14 Mar 2013 23:32:49 -0000
 @@ -139,7 +139,7 @@
      if (!_hPrev)
          init_application();
@@ -476,8 +476,8 @@ Index: x11.c
 RCS file: /sources/qemacs/qemacs/x11.c,v
 retrieving revision 1.28
 diff -u -r1.28 x11.c
---- x11.c	15 Apr 2008 23:24:04 -0000	1.28
-+++ x11.c	14 Mar 2013 23:32:49 -0000
+--- qemacs-0.3.2dev-cvs/x11.c	15 Apr 2008 23:24:04 -0000	1.28
++++ qemacs-0.3.2dev-cvs/x11.c	14 Mar 2013 23:32:49 -0000
 @@ -194,7 +194,7 @@
      QEStyleDef default_style;
      XGCValues gc_val;
@@ -582,8 +582,8 @@ diff -u -r1.28 x11.c
          l = q - x11_str;
          XSetFont(display, gc, xfont->fid);
          XDrawString16(display, dbuffer, gc, x_start, y, x11_str, l);
---- /dev/null	2013-03-14 16:10:28.351668000 +0100
-+++ haiku.cpp	2013-03-14 20:51:17.995622912 +0100
+--- qemacs-0.3.2dev-cvs//dev/null	2013-03-14 16:10:28.351668000 +0100
++++ qemacs-0.3.2dev-cvs/haiku.cpp	2013-03-14 20:51:17.995622912 +0100
 @@ -0,0 +1,883 @@
 +/*
 + * Haiku driver for QEmacs
@@ -1468,8 +1468,8 @@ diff -u -r1.28 x11.c
 +}
 +
 +qe_module_init(haiku_init);
---- /dev/null	2013-03-14 16:10:28.351668000 +0100
-+++ contrib/haiku-pe2qe.sh	2013-03-14 19:17:29.552599552 +0100
+--- qemacs-0.3.2dev-cvs//dev/null	2013-03-14 16:10:28.351668000 +0100
++++ qemacs-0.3.2dev-cvs/contrib/haiku-pe2qe.sh	2013-03-14 19:17:29.552599552 +0100
 @@ -0,0 +1,85 @@
 +#!/bin/sh
 +