1 files changed, 157 insertions, 0 deletions

diff --git a/editors/abiword/files/patch-aa b/editors/abiword/files/patch-aa
new file mode 100644
index 000000000000..36d19072ba9a
--- /dev/null
+++ b/editors/abiword/files/patch-aa
@@ -0,0 +1,157 @@
+diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
+--- src.old/af/gr/unix/Makefile	Fri Apr  9 08:47:46 1999
++++ src/af/gr/unix/Makefile	Tue May  4 03:59:30 1999
+@@ -25,7 +25,7 @@
+ CPPSRCS=		gr_UnixGraphics.cpp	\
+ 			gr_UnixImage.cpp
+ 
+-INCLUDES=		-I/usr/X11R6/include
++INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
+ 
+ TARGETS=		$(OBJS)
+ 
+diff -ruN src.old/af/util/xp/Makefile src/af/util/xp/Makefile
+--- src.old/af/util/xp/Makefile	Fri Apr  9 08:47:55 1999
++++ src/af/util/xp/Makefile	Tue May  4 03:59:30 1999
+@@ -44,7 +44,8 @@
+ 
+ TARGETS=		$(OBJS)
+ INCLUDES=		-I$(ABI_DEPTH)/../../libpng	\
+-			-I$(ABI_DEPTH)/../../zlib
++			-I$(ABI_DEPTH)/../../zlib \
++			-I/usr/local/include
+ 
+ include $(ABI_DEPTH)/config/abi_rules.mk
+ 
+diff -ruN src.old/af/util/xp/ut_png.cpp src/af/util/xp/ut_png.cpp
+--- src.old/af/util/xp/ut_png.cpp	Fri Feb 19 09:20:25 1999
++++ src/af/util/xp/ut_png.cpp	Tue May  4 03:59:30 1999
+@@ -17,7 +17,7 @@
+  * 02111-1307, USA.
+  */
+ 
+-#include "png.h"
++#include <png.h>
+ 
+ #include "ut_assert.h"
+ #include "ut_bytebuf.h"
+diff -ruN src.old/af/xap/unix/Makefile src/af/xap/unix/Makefile
+--- src.old/af/xap/unix/Makefile	Tue Apr 20 19:50:40 1999
++++ src/af/xap/unix/Makefile	Tue May  4 03:59:30 1999
+@@ -42,7 +42,7 @@
+ 			xap_UnixPSGraphics.cpp
+ 
+ TARGETS=		$(OBJS)
+-INCLUDES=		-I/usr/X11R6/include
++INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
+ 
+ include $(ABI_DEPTH)/config/abi_rules.mk
+ 
+diff -ruN src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
+--- src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Thu Apr 22 12:11:15 1999
++++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Tue May  4 03:59:30 1999
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <strings.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include "ut_string.h"
+diff -ruN src.old/af/xap/unix/xap_UnixFont.cpp src/af/xap/unix/xap_UnixFont.cpp
+--- src.old/af/xap/unix/xap_UnixFont.cpp	Tue Apr 20 07:35:11 1999
++++ src/af/xap/unix/xap_UnixFont.cpp	Tue May  4 03:59:30 1999
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_string.h"
+diff -ruN src.old/config/abi_defs.mk src/config/abi_defs.mk
+--- src.old/config/abi_defs.mk	Thu Apr 29 10:46:27 1999
++++ src/config/abi_defs.mk	Tue May  4 03:59:30 1999
+@@ -230,8 +230,8 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ ifeq ($(ABI_NATIVE),unix)
+-CFLAGS 		+=	`gtk-config --cflags`
+-EXTRA_LIBS	+=	`gtk-config --libs`
++CFLAGS 		+=	`gtk12-config --cflags`
++EXTRA_LIBS	+=	`gtk12-config --libs`
+ endif
+ 
+ ##################################################################
+diff -ruN src.old/config/require/unix/Makefile src/config/require/unix/Makefile
+--- src.old/config/require/unix/Makefile	Fri Apr  9 09:20:30 1999
++++ src/config/require/unix/Makefile	Tue May  4 03:59:30 1999
+@@ -48,12 +48,12 @@
+ REQ_GTK_BUILD=13
+ 
+ _GLIB_:
+-	@glib-config --version >/dev/null 2>&1 			\
++	@glib12-config --version >/dev/null 2>&1 			\
+ 	|| (echo glib not found; exit 1)
+ 	@echo TODO verify version is greater than 1.1.??
+ 
+ _GTK_:
+-	@gtk-config --version >/dev/null 2>&1			\
++	@gtk12-config --version >/dev/null 2>&1			\
+ 	|| (echo gtk not found; exit 1)
+ 	@echo TODO verify version is greater than 1.1.??
+ 
+diff -ruN src.old/hello/main/unix/Makefile src/hello/main/unix/Makefile
+--- src.old/hello/main/unix/Makefile	Fri Apr  9 09:43:52 1999
++++ src/hello/main/unix/Makefile	Tue May  4 03:59:30 1999
+@@ -24,7 +24,7 @@
+ 
+ CPPSRCS=		UnixMain.cpp
+ 
+-INCLUDES=		`gtk-config --cflags`
++INCLUDES=		`gtk12-config --cflags`
+ 
+ PROGRAM=		AbiHello
+ 
+diff -ruN src.old/wp/ap/unix/ap_UnixApp.cpp src/wp/ap/unix/ap_UnixApp.cpp
+--- src.old/wp/ap/unix/ap_UnixApp.cpp	Mon Apr 26 13:39:41 1999
++++ src/wp/ap/unix/ap_UnixApp.cpp	Tue May  4 03:59:30 1999
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_debugmsg.h"
+diff -ruN src.old/wp/ap/xp/ap_Prefs_SchemeIds.h src/wp/ap/xp/ap_Prefs_SchemeIds.h
+--- src.old/wp/ap/xp/ap_Prefs_SchemeIds.h	Sun Apr 18 22:29:36 1999
++++ src/wp/ap/xp/ap_Prefs_SchemeIds.h	Tue May  4 04:03:32 1999
+@@ -50,13 +50,13 @@
+ #define AP_PREF_KEY_StringSet						"StringSet"
+ #define AP_PREF_DEFAULT_StringSet					"EnUS"						/* name of dialog/msgbox strings */
+ #define AP_PREF_KEY_BeOSISpellDirectory				"BeOSISpellDirectory"
+-#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
++#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
+ 
+ #define AP_PREF_KEY_BeOSStringSetDirectory			"BeOSStringSetDirectory"
+ #define AP_PREF_DEFAULT_BeOSStringSetDirectory		"/boot/home/config/settings/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
+ 
+ #define AP_PREF_KEY_UnixISpellDirectory				"UnixISpellDirectory"
+-#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
++#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
+ 
+ #define AP_PREF_KEY_UnixStringSetDirectory			"UnixStringSetDirectory"
+ #define AP_PREF_DEFAULT_UnixStringSetDirectory		"/usr/local/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
+diff -ruN src.old/wp/main/unix/Makefile src/wp/main/unix/Makefile
+--- src.old/wp/main/unix/Makefile	Fri Apr  9 09:13:48 1999
++++ src/wp/main/unix/Makefile	Tue May  4 03:59:30 1999
+@@ -24,7 +24,7 @@
+ 
+ CPPSRCS=		UnixMain.cpp
+ 
+-INCLUDES=		`gtk-config --cflags`
++INCLUDES=		`gtk12-config --cflags`
+ 
+ PROGRAM=		AbiWord
+