5 files changed, 44 insertions, 35 deletions

diff --git a/editors/qemacs/files/patch-Makefile b/editors/qemacs/files/patch-Makefile
deleted file mode 100644
index dc8d946d5a28..000000000000
--- a/editors/qemacs/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	Thu May  2 02:27:40 2002
-+++ Makefile	Fri Nov 24 15:53:28 2006
-@@ -42,17 +42,17 @@
- #
- CONFIG_PNG_OUTPUT=y
- 
--HOST_CC=gcc
--CC=$(HOST_CC)
-+HOST_CC?=gcc
-+CC?=$(HOST_CC)
- PROFILE=
--CFLAGS=-Wall -O2 -g $(PROFILE)
-+CFLAGS?=-Wall -O2 -g $(PROFILE)
- #CFLAGS+=-fomit-frame-pointer
- #CPU dependent flags
--CFLAGS+=-m386 -malign-functions=0
--LDFLAGS= $(PROFILE)
-+#CFLAGS+=-m386 -malign-functions=0
-+LDFLAGS?= $(PROFILE)
- STRIP=strip -s -R .comment -R .note
- DEFINES=
--prefix=/usr/local
-+prefix?=/usr/local
- 
- ########################################################
- # do not modify after this
-@@ -136,7 +136,7 @@
- DEFINES+= -DCONFIG_XFT
- LIBS+=-lXft
- endif
--LIBS+= -L/usr/X11R6/lib -lXext -lX11
-+LIBS+= -L$(X11BASE)/lib -lXext -lX11
- endif
- 
- ifdef CONFIG_HTML
diff --git a/editors/qemacs/files/patch-charset.c b/editors/qemacs/files/patch-charset.c
new file mode 100644
index 000000000000..d8796d70e349
--- /dev/null
+++ b/editors/qemacs/files/patch-charset.c
@@ -0,0 +1,11 @@
+--- charset.c.orig	Tue Apr 22 07:01:42 2003
++++ charset.c	Thu Jan 18 13:56:10 2007
+@@ -20,7 +20,7 @@
+ 
+ QECharset *first_charset = NULL;
+ 
+-extern QECharset charset_7bit;
++static QECharset charset_7bit;
+ 
+ /* specific tables */
+ static unsigned short table_idem[256];
diff --git a/editors/qemacs/files/patch-configure b/editors/qemacs/files/patch-configure
new file mode 100644
index 000000000000..6a141f1d05d9
--- /dev/null
+++ b/editors/qemacs/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Apr 22 07:01:43 2003
++++ configure	Thu Jan 18 12:39:56 2007
+@@ -311,7 +311,7 @@
+ head $source_path/VERSION >>config.mak
+ echo "" >>config.mak
+ echo -n "#define QE_VERSION \"" >> $TMPH
+-head $source_path/VERSION >> $TMPH
++echo -n `head $source_path/VERSION` >> $TMPH
+ echo "\"" >> $TMPH
+ if test "$network" = "yes" ; then
+   echo "#define CONFIG_NETWORK 1" >> $TMPH
diff --git a/editors/qemacs/files/patch-tty.c b/editors/qemacs/files/patch-tty.c
new file mode 100644
index 000000000000..36726f020dd5
--- /dev/null
+++ b/editors/qemacs/files/patch-tty.c
@@ -0,0 +1,11 @@
+--- tty.c.orig	Tue Apr 22 07:01:42 2003
++++ tty.c	Thu Jan 18 13:56:41 2007
+@@ -70,7 +70,7 @@
+     return 1;
+ }
+ 
+-extern QEDisplay tty_dpy;
++static QEDisplay tty_dpy;
+ 
+ static int term_init(QEditScreen *s, int w, int h)
+ {
diff --git a/editors/qemacs/files/patch-x11.c b/editors/qemacs/files/patch-x11.c
new file mode 100644
index 000000000000..2e0654fbf9be
--- /dev/null
+++ b/editors/qemacs/files/patch-x11.c
@@ -0,0 +1,11 @@
+--- x11.c.orig	Tue Apr 22 07:01:42 2003
++++ x11.c	Thu Jan 18 13:57:10 2007
+@@ -76,7 +76,7 @@
+ static CSSRect update_rects[UPDATE_MAX_REGIONS];
+ #endif
+ 
+-extern QEDisplay x11_dpy;
++static QEDisplay x11_dpy;
+ static int visual_depth;
+ 
+ static int force_tty = 0;