Update to version 21.5.11.

Remove GTK support until I figure out why it isn't working.

2 files changed, 25 insertions, 25 deletions

diff --git a/editors/xemacs-devel/files/patch-af b/editors/xemacs-devel/files/patch-af
index c0c55cbf0aef..814548dd9365 100644
--- a/editors/xemacs-devel/files/patch-af
+++ b/editors/xemacs-devel/files/patch-af
@@ -1,14 +1,14 @@
---- configure.in.orig	Wed Jul 25 09:39:21 2001
-+++ configure.in	Sun Oct  7 23:20:24 2001
-@@ -1098,6 +1098,7 @@
+--- configure.in.orig	Fri Feb 14 14:31:16 2003
++++ configure.in	Tue Apr 29 21:52:41 2003
+@@ -1133,6 +1133,7 @@
  dnl Straightforward OS determination
  case "$canonical" in
    *-*-linux*    ) opsys=linux ;;
-+  *-*-freebsd* ) opsys=freebsd ;;
++  *-*-freebsd*   ) opsys=freebsd ;;
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -3661,21 +3662,24 @@
+@@ -3920,20 +3921,24 @@
      test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
    fi
    dnl Back to our regularly scheduled wnn hunting
@@ -17,32 +17,32 @@
 -      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
 -	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
 -	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
-+  if test "$with_wnn6" = "yes"; then
-+    AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
-+      AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
-+	AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
-+  else
-+    if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-+      AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-+	AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
-+	  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
-+	    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
-+    fi
++ if test "$with_wnn6" = "yes"; then
++   AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
++     AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
++AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
++ else
++   if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
++     AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
++AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
++  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
++    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
++   fi
    fi
    test -z "$with_wnn" && with_wnn=yes
    if test "$with_wnn" = "yes"; then
      AC_DEFINE(HAVE_WNN)
      XE_PREPEND(-l$libwnn, libs_x)
-     XE_ADD_OBJS(mule-wnnfns.o)
 -    if test "$with_wnn6" != "no"; then
 -      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
 -      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
 -    fi
++    dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
 +    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
    fi
  
    dnl Autodetect canna
-@@ -4257,7 +4261,7 @@
+@@ -4526,7 +4531,7 @@
  dnl Check for Berkeley DB.
  if test "$with_database_berkdb" != "no"; then
    AC_MSG_CHECKING(for Berkeley db.h)
diff --git a/editors/xemacs-devel/files/patch-al b/editors/xemacs-devel/files/patch-al
index c6650ddf51c4..ef0ae35060df 100644
--- a/editors/xemacs-devel/files/patch-al
+++ b/editors/xemacs-devel/files/patch-al
@@ -1,11 +1,11 @@
---- src/lstream.c.orig	Sat Jun 29 18:17:20 2002
-+++ src/lstream.c	Sat Jun 29 18:14:06 2002
-@@ -181,7 +181,7 @@
+--- src/lstream.c.orig	Tue Apr 29 21:31:17 2003
++++ src/lstream.c	Tue Apr 29 21:31:22 2003
+@@ -101,7 +101,7 @@
      }
  }
  
--inline static size_t
-+/*inline*/ static size_t
- aligned_sizeof_lstream (size_t lstream_type_specific_size)
+-inline static Bytecount
++/*inline*/ static Bytecount
+ aligned_sizeof_lstream (Bytecount lstream_type_specific_size)
  {
-   return ALIGN_SIZE (offsetof (Lstream, data) + lstream_type_specific_size,
+   return MAX_ALIGN_SIZE (offsetof (Lstream, data) +