diff options
Diffstat (limited to 'editors/abiword/patches')
-rw-r--r-- | editors/abiword/patches/patch-ab | 6 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ac | 14 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ae | 10 | ||||
-rw-r--r-- | editors/abiword/patches/patch-af | 12 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ag | 26 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ai | 26 | ||||
-rw-r--r-- | editors/abiword/patches/patch-aj | 22 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ak | 20 |
8 files changed, 91 insertions, 45 deletions
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab index 1bceaf9ca8d..4a629dc6a06 100644 --- a/editors/abiword/patches/patch-ab +++ b/editors/abiword/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2001/08/10 04:50:08 jlam Exp $ ---- src/Makefile.orig Mon Mar 19 20:18:57 2001 +--- src/Makefile.orig Sun Jul 15 03:13:26 2001 +++ src/Makefile -@@ -132,7 +132,7 @@ +@@ -135,7 +135,7 @@ endif # The generic target diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac index b52cd1d5062..f74e2eaa748 100644 --- a/editors/abiword/patches/patch-ac +++ b/editors/abiword/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.5 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2001/08/10 04:50:08 jlam Exp $ ---- src/af/util/xp/ut_endian.h.orig Sat Feb 24 03:49:29 2001 +--- src/af/util/xp/ut_endian.h.orig Wed Jul 18 10:48:29 2001 +++ src/af/util/xp/ut_endian.h -@@ -28,6 +28,13 @@ - #else - #define UT_BIG_ENDIAN - #endif +@@ -48,6 +48,13 @@ + #elif defined(_LITTLE_ENDIAN) + #define UT_LITTLE_ENDIAN + #endif +#elif defined(__NetBSD__) + #include <machine/endian.h> -+ #if BYTE_ORDER == LITTLE_ENDIAN ++ #if BYTE_ORDER == LITTLE_ENDIAN + #define UT_LITTLE_ENDIAN + #elif BYTE_ORDER == BIG_ENDIAN + #define UT_BIG_ENDIAN diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae index 55a35f389ab..0dbabdf1097 100644 --- a/editors/abiword/patches/patch-ae +++ b/editors/abiword/patches/patch-ae @@ -1,15 +1,15 @@ -$NetBSD: patch-ae,v 1.4 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-ae,v 1.5 2001/08/10 04:50:08 jlam Exp $ ---- src/other/spell/ispell.h.orig Sat Mar 24 20:30:02 2001 -+++ src/other/spell/ispell.h -@@ -517,8 +517,8 @@ +--- src/other/spell/xp/ispell.h.orig Tue Jun 26 12:33:27 2001 ++++ src/other/spell/xp/ispell.h +@@ -531,8 +531,8 @@ short maxstringcharlen; /* Max strchr len supported */ short compoundmin; /* Min lth of compound parts */ short compoundbit; /* Flag 4 compounding roots */ - int stringsize; /* Size of string table */ - int lstringsize; /* Size of lang. str tbl */ + PTRSIZE stringsize; /* Size of string table */ -+ PTRSIZE lstringsize; /* Size of lang. str tbl */ ++ PTRSIZE lstringsize; /* Size of lang. str tbl */ int tblsize; /* No. entries in hash tbl */ int stblsize; /* No. entries in sfx tbl */ int ptblsize; /* No. entries in pfx tbl */ diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af index 421999fdb00..68cd3a69896 100644 --- a/editors/abiword/patches/patch-af +++ b/editors/abiword/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.5 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-af,v 1.6 2001/08/10 04:50:08 jlam Exp $ ---- src/other/spell/ispell_def.h.orig Sat Mar 24 20:30:02 2001 -+++ src/other/spell/ispell_def.h +--- src/other/spell/xp/ispell_def.h.orig Sun Apr 15 12:01:24 2001 ++++ src/other/spell/xp/ispell_def.h @@ -2,3 +2,13 @@ #ifndef INPUTWORDLEN #define INPUTWORDLEN 100 @@ -9,10 +9,10 @@ $NetBSD: patch-af,v 1.5 2001/05/24 04:28:20 jlam Exp $ + +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> -+#define PTRSIZE intptr_t ++#define PTRSIZE intptr_t +#else -+#define PTRSIZE int ++#define PTRSIZE int +#endif +#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__) -+#define PTRSIZE long ++#define PTRSIZE long +#endif /* hack for 1.3 */ diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag index f569cebc3f0..0804c9620fe 100644 --- a/editors/abiword/patches/patch-ag +++ b/editors/abiword/patches/patch-ag @@ -1,31 +1,31 @@ -$NetBSD: patch-ag,v 1.4 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-ag,v 1.5 2001/08/10 04:50:09 jlam Exp $ ---- src/other/spell/lookup.c.orig Wed Sep 29 19:33:32 1999 -+++ src/other/spell/lookup.c -@@ -285,22 +285,22 @@ +--- src/other/spell/xp/lookup.c.orig Wed Jul 18 13:46:01 2001 ++++ src/other/spell/xp/lookup.c +@@ -301,22 +301,22 @@ if (dp->word == (char *) -1) dp->word = NULL; else -- dp->word = &hashstrings [ (int)(dp->word) ]; -+ dp->word = &hashstrings [ (PTRSIZE)(dp->word) ]; +- dp->word = &DEREF(istate, hashstrings [ (int)(dp->word) ]); ++ dp->word = &DEREF(istate, hashstrings [ (PTRSIZE)(dp->word) ]); if (dp->next == (struct dent *) -1) dp->next = NULL; else -- dp->next = &hashtbl [ (int)(dp->next) ]; -+ dp->next = &hashtbl [ (PTRSIZE)(dp->next) ]; +- dp->next = &DEREF(istate, hashtbl [ (int)(dp->next) ]); ++ dp->next = &DEREF(istate, hashtbl [ (PTRSIZE)(dp->next) ]); } } - for (i = numsflags + numpflags, entry = sflaglist; --i >= 0; entry++) + for (i = DEREF(istate, numsflags) + DEREF(istate, numpflags), entry = DEREF(istate, sflaglist); --i >= 0; entry++) { if (entry->stripl) -- entry->strip = (ichar_t *) &hashstrings[(int) entry->strip]; -+ entry->strip = (ichar_t *) &hashstrings[(PTRSIZE) entry->strip]; +- entry->strip = (ichar_t *) &DEREF(istate, hashstrings[(int) entry->strip]); ++ entry->strip = (ichar_t *) &DEREF(istate, hashstrings[(PTRSIZE) entry->strip]); else entry->strip = NULL; if (entry->affl) -- entry->affix = (ichar_t *) &hashstrings[(int) entry->affix]; -+ entry->affix = (ichar_t *) &hashstrings[(PTRSIZE) entry->affix]; +- entry->affix = (ichar_t *) &DEREF(istate, hashstrings[(int) entry->affix]); ++ entry->affix = (ichar_t *) &DEREF(istate, hashstrings[(PTRSIZE) entry->affix]); else entry->affix = NULL; } diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai index 08429feca2b..3c3857d901a 100644 --- a/editors/abiword/patches/patch-ai +++ b/editors/abiword/patches/patch-ai @@ -1,13 +1,17 @@ -$NetBSD: patch-ai,v 1.4 2001/05/24 04:28:20 jlam Exp $ +$NetBSD: patch-ai,v 1.5 2001/08/10 04:50:09 jlam Exp $ ---- ../psiconv/psiconv/generate_layout.c.orig Mon Mar 5 22:46:15 2001 -+++ ../psiconv/psiconv/generate_layout.c -@@ -78,7 +78,7 @@ - return res; - if ((res = psiconv_write_color(buf,value->color))) - return res; -- // Unknown byte -+ /* Unknown byte */ - return psiconv_write_u8(buf,1); - } +--- src/config/platforms/netbsd.mk.orig Fri Jun 8 12:07:03 2001 ++++ src/config/platforms/netbsd.mk +@@ -75,9 +75,9 @@ + # Linker flags + OS_DLLFLAGS += +-GLIB_CONFIG = glib-config +-GTK_CONFIG = gtk-config +-GNOME_CONFIG = gnome-config ++#GLIB_CONFIG = glib-config ++#GTK_CONFIG = gtk-config ++#GNOME_CONFIG = gnome-config + + # Shared library flags + MKSHLIB = $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so) diff --git a/editors/abiword/patches/patch-aj b/editors/abiword/patches/patch-aj new file mode 100644 index 00000000000..db38898540a --- /dev/null +++ b/editors/abiword/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.3 2001/08/10 04:50:09 jlam Exp $ + +--- src/config/abi_defs.mk.orig Wed Jul 18 09:01:58 2001 ++++ src/config/abi_defs.mk +@@ -584,7 +584,7 @@ + ABI_OPTIONS +=GnomeVFS:On + endif + +-GNOME_CFLAGS += $(shell glib-config --cflags) ++GNOME_CFLAGS += $(shell $(GLIB_CONFIG) --cflags) + + # the bonobo target is known not to work properly yet + ifdef ABI_OPT_BONOBO +@@ -614,7 +614,7 @@ + ABI_OPT_GNOME= + GTK_CFLAGS := $(shell $(GTK_CONFIG) --cflags) + GTK_LIBS := $(shell $(GTK_CONFIG) --libs) +-GLIB_CFLAGS := $(shell glib-config --cflags) ++GLIB_CFLAGS := $(shell $(GLIB_CONFIG) --cflags) + CFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS) + EXTRA_LIBS += $(GTK_LIBS) + # diff --git a/editors/abiword/patches/patch-ak b/editors/abiword/patches/patch-ak new file mode 100644 index 00000000000..d6a2eba62bf --- /dev/null +++ b/editors/abiword/patches/patch-ak @@ -0,0 +1,20 @@ +$NetBSD: patch-ak,v 1.3 2001/08/10 04:50:09 jlam Exp $ + +--- src/pkg/common/unix/scripts/install.sh.orig Sat Apr 7 03:59:52 2001 ++++ src/pkg/common/unix/scripts/install.sh +@@ -131,15 +131,6 @@ + + + ######################################################################## +-# Copy the ttfadmin script to $TARGET/bin +-######################################################################## +- +-echo "Installing ttfadmin script [$TARGET/bin]" +-cp -f $SCRIPTDIR/../../../../tools/scripts/unix/ttfadmin.sh $TARGET/bin/ttfadmin.sh +-chmod -f 500 $TARGET/bin/ttfadmin.sh +- +- +-######################################################################## + # Done + ######################################################################## + echo "" |