OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=41

2009-06-17 13:52:36 +00:00 · 2009-06-17 13:52:36 +00:00 · fbac23a4ae
commit fbac23a4ae
parent ca3648a036
29 changed files with 676 additions and 670 deletions
--- a/bnc432404-bytecomp.diff
+++ b/bnc432404-bytecomp.diff
@ -1,15 +0,0 @@
-diff -ru xemacs-21.5.28.20080401.orig//lisp/bytecomp.el xemacs-21.5.28.20080401/lisp/bytecomp.el
--- xemacs-21.5.28.20080401.orig//lisp/bytecomp.el	2008-04-01 19:40:35.000000000 +0200
-+++ xemacs-21.5.28.20080401/lisp/bytecomp.el	2008-10-29 12:48:15.000000000 +0100
-@@ -1618,7 +1618,10 @@
- 	(unless byte-compile-overwrite-file
- 	  (ignore-file-errors (delete-file target-file)))
- 	(if (file-writable-p target-file)
-	    (write-region 1 (point-max) target-file)
-+           ;; prevent generic hooks from changing our format, eg,
-+           ;; latin-unity is known to change the coding system!
-+           (let ((write-region-pre-hook nil))
-+             (write-region 1 (point-max) target-file))
- 	  ;; This is just to give a better error message than write-region
- 	  (signal 'file-error
- 		  (list "Opening output file"
--- a/bnc450838-make-generic-print-buffer-work.patch
+++ b/bnc450838-make-generic-print-buffer-work.patch
@ -1,22 +0,0 @@
-diff -r 49f8ed034500 -r 78767f901c2b lisp/printer.el
--- a/lisp/printer.el	Mon May 12 11:53:04 2008 +0200
-+++ b/lisp/printer.el	Tue May 13 14:56:38 2008 +0200
-@@ -263,7 +263,7 @@ If BUFFER is nil or omitted, the current
-       (let* ((print-region (and (interactive-p) (region-active-p)))
- 	     (start (if print-region (region-beginning) (point-min buffer)))
- 	     (end (if print-region (region-end) (point-max buffer))))
-	(if (or (not (valid-specifier-tag-p 'msprinter))
-+	(if (or (not (valid-device-type-p 'msprinter))
- 		(not display-print-dialog))
- 	    (generic-print-region start end buffer)
- 	  (let* ((d (Printer-get-device))
-@@ -312,7 +312,7 @@ Recognized properties are the same as th
-   to-page    Last page to print, inclusive, If omitted, printing ends at
-              the end.
-   copies     Number of copies to print.  If omitted, one copy is printed."
-  (cond ((valid-specifier-tag-p 'msprinter)
-+  (cond ((valid-device-type-p 'msprinter)
- 	 ;; loop, printing one copy of document per loop.  kill and
- 	 ;; re-create the frame each time so that we eject the piece
- 	 ;; of paper at the end even if we're printing more than one
-
--- a/bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
+++ b/bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.28.orig/lisp/x-faces.el xemacs-21.5.28/lisp/x-faces.el
--- xemacs-21.5.28.orig/lisp/x-faces.el	2007-05-07 16:27:44.000000000 +0200
-+++ xemacs-21.5.28/lisp/x-faces.el	2007-07-18 19:25:10.000000000 +0200
-@@ -198,7 +198,7 @@
+Index: xemacs-21.5.29/lisp/x-faces.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/x-faces.el
+++ xemacs-21.5.29/lisp/x-faces.el
+@@ -198,7 +198,7 @@ If it fails, it returns nil."
 				(fc-name-parse font))))
     (if pattern
 	(let ((size (fc-pattern-get-size pattern 0))
@ -10,7 +11,7 @@ diff -ru xemacs-21.5.28.orig/lisp/x-faces.el xemacs-21.5.28/lisp/x-faces.el
 	  (fc-pattern-del-weight copy)
 	  (fc-pattern-del-style copy)
 	  (when copy
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ If it fails, it returns nil."
 				(fc-name-parse font))))
     (if pattern
       (let ((size (fc-pattern-get-size pattern 0))
--- a/bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch
+++ b/bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch
@ -1,6 +1,8 @@
--- xemacs-21.5.28.20070730.orig/lisp/startup.el	2007-07-26 15:22:08.000000000 +0200
-+++ xemacs-21.5.28.20070730/lisp/startup.el	2007-07-30 15:08:05.000000000 +0200
-@@ -712,6 +712,9 @@
+Index: xemacs-21.5.29/lisp/startup.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/startup.el
+++ xemacs-21.5.29/lisp/startup.el
+@@ -720,6 +720,9 @@ If this is nil, no message will be displ
       ;; initialisation in case of keysyms of the form UABCD.
       (when (featurep 'mule)
 	(declare-fboundp (init-mule-at-startup)))
--- a/bugzilla-301352-fix-wrong-incrementing-in-macros.patch
+++ b/bugzilla-301352-fix-wrong-incrementing-in-macros.patch
@ -1,6 +1,8 @@
--- xemacs-21.5.28.20070807/src/mule-ccl.c	2007-08-21 15:48:12.000000000 +0200
-+++ xemacs-21.5.28.20070807/src/mule-ccl.c	2007-08-21 17:22:14.000000000 +0200
-@@ -1578,7 +1578,7 @@
+Index: xemacs-21.5.29/src/mule-ccl.c
+===================================================================
+--- xemacs-21.5.29.orig/src/mule-ccl.c
+++ xemacs-21.5.29/src/mule-ccl.c
+@@ -1612,7 +1612,7 @@ ccl_driver (struct ccl_program *ccl,
 		Lisp_Object map, content, attrib, value;
 		int point, size, fin_ic;
 
@ -9,7 +11,7 @@
 		fin_ic = ic + j;
 		op = reg[rrr];
 		if ((j > reg[RRR]) && (j >= 0))
-@@ -1596,7 +1596,7 @@
+@@ -1630,7 +1630,7 @@ ccl_driver (struct ccl_program *ccl,
 		for (;i < j;i++)
 		  {
 		    size = XVECTOR (Vcode_conversion_map_vector)->size;
@ -18,7 +20,7 @@
 		    if (point >= size) continue;
 		    map =
 		      XVECTOR (Vcode_conversion_map_vector)->contents[point];
-@@ -1693,7 +1693,7 @@
+@@ -1727,7 +1727,7 @@ ccl_driver (struct ccl_program *ccl,
 		stack_idx_of_map_multiple = 0;
 
 		map_set_rest_length =
@ -27,7 +29,7 @@
 		fin_ic = ic + map_set_rest_length;
 		op = reg[rrr];
 
-@@ -1880,7 +1880,7 @@
+@@ -1914,7 +1914,7 @@ ccl_driver (struct ccl_program *ccl,
 	      {
 		Lisp_Object map, attrib, value, content;
 		int size, point;
--- a/cast-pointer-integer-different-size.patch
+++ b/cast-pointer-integer-different-size.patch
@ -1,75 +0,0 @@
-diff -ru xemacs-21.5.28.20070726.orig/src/eval.c xemacs-21.5.28.20070726/src/eval.c
--- xemacs-21.5.28.20070726.orig/src/eval.c	2007-07-26 15:22:25.000000000 +0200
-+++ xemacs-21.5.28.20070726/src/eval.c	2007-07-26 17:15:07.000000000 +0200
-@@ -136,6 +136,7 @@
- */
- 
- #include <config.h>
-+#include <stdint.h>
- #include "lisp.h"
- 
- #include "commands.h"
-@@ -6007,7 +6008,7 @@
-   Lisp_Object opaque = XCAR (cons);
-   Lisp_Object lval = XCDR (cons);
-   int *addr = (int *) get_opaque_ptr (opaque);
-  int val;
-+  intptr_t val;
- 
-   /* In the event that a C integer will always fit in an Emacs int, we
-      haven't ever stored a C integer as an opaque pointer. This #ifdef
-@@ -6020,7 +6021,7 @@
-     }
-   else
-     {
-      val = (int) get_opaque_ptr (lval);
-+      val = (intptr_t) get_opaque_ptr (lval);
-       free_opaque_ptr (lval);
-     }
- #else /* !(INT_VALBITS < INTBITS) */
-diff -ru xemacs-21.5.28.20070726.orig/src/event-unixoid.c xemacs-21.5.28.20070726/src/event-unixoid.c
--- xemacs-21.5.28.20070726.orig/src/event-unixoid.c	2007-07-26 15:22:25.000000000 +0200
-+++ xemacs-21.5.28.20070726/src/event-unixoid.c	2007-07-26 17:16:53.000000000 +0200
-@@ -27,6 +27,7 @@
- /* This file has been Mule-ized. */
- 
- #include <config.h>
-+#include <stdint.h>
- #include "lisp.h"
- 
- #include "console-stream-impl.h"
-@@ -362,9 +363,9 @@
-      the process implementation being used. */
-   /* We are passed plain old file descs, which are ints, so */
-   /* if sizeof(EMACS_INT) > sizeof(int) it's OK. */
-  infd  = (EMACS_INT) inhandle;
-  outfd = (EMACS_INT) outhandle;
-  errfd = (EMACS_INT) errhandle;
-+  infd  = (EMACS_INT) (intptr_t) inhandle;
-+  outfd = (EMACS_INT) (intptr_t) outhandle;
-+  errfd = (EMACS_INT) (intptr_t) errhandle;
- 
-   *instream = (infd >= 0
- 	       ? make_filedesc_input_stream (infd, 0, -1, 0)
-diff -ru xemacs-21.5.28.20070726.orig/src/process-unix.c xemacs-21.5.28.20070726/src/process-unix.c
--- xemacs-21.5.28.20070726.orig/src/process-unix.c	2007-07-26 15:22:26.000000000 +0200
-+++ xemacs-21.5.28.20070726/src/process-unix.c	2007-07-26 17:19:24.000000000 +0200
-@@ -31,6 +31,7 @@
-    written by Wolfgang S. Rupprecht */
- 
- #include <config.h>
-+#include <stdint.h>
- 
- #if !defined (NO_SUBPROCESSES)
- 
-@@ -847,8 +848,8 @@
- 			      void *err, int UNUSED (flags))
- {
-   /* if sizeof(EMACS_INT) > sizeof(int) this truncates the value */
-  UNIX_DATA(p)->infd = (EMACS_INT) in;
-  UNIX_DATA(p)->errfd = (EMACS_INT) err;
-+  UNIX_DATA(p)->infd = (EMACS_INT) (intptr_t) in;
-+  UNIX_DATA(p)->errfd = (EMACS_INT) (intptr_t) err;
- }
- 
- /* Move the file descriptor FD so that its number is not less than MIN. *
--- a/destdir.patch
+++ b/destdir.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
--- xemacs-21.5.24.orig/Makefile.in.in	2005-12-27 18:11:00.000000000 +0100
-+++ xemacs-21.5.24/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
-@@ -61,6 +61,8 @@
+Index: xemacs-21.5.29/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/Makefile.in.in
+++ xemacs-21.5.29/Makefile.in.in
+@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS=
 RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
 #endif
 
@ -10,7 +11,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 SHELL = /bin/sh
 LANG = C
 LC_ALL = C
-@@ -382,35 +384,35 @@
+@@ -394,18 +396,18 @@ install-arch-dep: mkdir
 	(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
 	    archlibdir=${archlibdir}) ; done
@ -33,25 +34,19 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 +	${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
 #endif
 #ifdef WIN32_NATIVE
-	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
-	-chmod 0755 ${bindir}/${PROGNAME}
-+	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
-+	-chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}
- #else
- # ifdef CYGWIN
-	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
-	-chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
-	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
-+	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
-+	-chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
-+	cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
+ 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
+@@ -417,14 +419,14 @@ install-arch-dep: mkdir
+ 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
+ 	cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME}
 # else
 -	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
 -	-chmod 0755 ${bindir}/${PROGNAME}-${version}
 -	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
+-	cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
 +	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}
 +	-chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}
 +	cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
+	cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
 # endif /* CYGWIN */
 #endif /* WIN32_NATIVE */
 	if test "${prefix}" != "${exec_prefix}"; then \
@ -60,7 +55,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 	  for dir in \
 		lib/${inststaticdir} \
 	 	lib/${instvardir}/etc \
-@@ -421,13 +423,13 @@
+@@ -435,13 +437,13 @@ install-arch-dep: mkdir
 	  done; \
 	fi
 #ifdef HAVE_SHLIB
@ -76,7 +71,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 		   "`(cd $${dir} && $(pwd))`"; then \
 	     : do nothing - echo "rm -rf $$1" ; \
 	   fi ; \
-@@ -435,35 +437,35 @@
+@@ -449,35 +451,35 @@ install-arch-indep: mkdir info
 	 done
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDESTS} ; do \
@ -124,7 +119,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 	  done
 	@echo "If you would like to save approximately 4M of disk space, do"
 	@echo "make gzip-el"
-@@ -473,19 +475,23 @@
+@@ -487,19 +489,23 @@ install-arch-indep: mkdir info
 	@echo "${lispdir}"
 
 gzip-el:
@ -151,11 +146,12 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
 +	    ${MAKEPATH} $(DESTDIR)$${dir} ; \
 +	done ;
 
- ## Delete all the installed files that the `install' target would
- ## create (but not the noninstalled files such as `make all' would
-diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Makefile.in.in
--- xemacs-21.5.24.orig/dynodump/Makefile.in.in	2005-12-27 18:11:04.000000000 +0100
-+++ xemacs-21.5.24/dynodump/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
+ ## Install bundled packages, if present.
+ 
+Index: xemacs-21.5.29/dynodump/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/dynodump/Makefile.in.in
+++ xemacs-21.5.29/dynodump/Makefile.in.in
@@ -22,6 +22,8 @@
 
 ## Synched up with: Not synched with FSF.
@ -165,18 +161,20 @@ diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Mak
 ## For performance and consistency, no built-in rules.
 .SUFFIXES:
 .SUFFIXES: .c .o .i .h
-diff -ru xemacs-21.5.24.orig/etc/tests/external-widget/Makefile xemacs-21.5.24/etc/tests/external-widget/Makefile
--- xemacs-21.5.24.orig/etc/tests/external-widget/Makefile	1996-12-18 23:42:31.000000000 +0100
-+++ xemacs-21.5.24/etc/tests/external-widget/Makefile	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/etc/tests/external-widget/Makefile
+===================================================================
+--- xemacs-21.5.29.orig/etc/tests/external-widget/Makefile
+++ xemacs-21.5.29/etc/tests/external-widget/Makefile
@@ -1,3 +1,5 @@
 +DESTDIR=
 +
 CFLAGS += -Xc -g -DTOOLTALK
 EMACSHOME = ../../..
 EMACSLIBDIR = $(EMACSHOME)/editor/src
-diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makefile.in.in
--- xemacs-21.5.24.orig/lib-src/Makefile.in.in	2005-12-27 18:11:23.000000000 +0100
-+++ xemacs-21.5.24/lib-src/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/lib-src/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/lib-src/Makefile.in.in
+++ xemacs-21.5.29/lib-src/Makefile.in.in
@@ -24,6 +24,8 @@
 ## above a certain point in this file are in shell format instead of
 ## in C format.  How the hell is this supposed to work? */
@ -186,7 +184,7 @@ diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makef
 ## For performance and consistency, no built-in rules
 .SUFFIXES:
 .SUFFIXES: .c .h .o
-@@ -244,26 +246,26 @@
+@@ -246,26 +248,26 @@ do-blessmail: $(blessmail)
 ## just run them directly from lib-src.
 ${archlibdir}: all
 	@echo; echo "Installing utilities run internally by XEmacs."
@ -218,9 +216,10 @@ diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makef
 	done
 
 uninstall:
-diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.in.in
--- xemacs-21.5.24.orig/lwlib/Makefile.in.in	2005-12-27 18:11:45.000000000 +0100
-+++ xemacs-21.5.24/lwlib/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/lwlib/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/lwlib/Makefile.in.in
+++ xemacs-21.5.29/lwlib/Makefile.in.in
@@ -22,6 +22,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
@ -230,9 +229,10 @@ diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.
 ## For performance and consistency, no built-in rules
 .SUFFIXES:
 .SUFFIXES: .c .h .o .i .s
-diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile
--- xemacs-21.5.24.orig/man/Makefile	2005-12-27 18:11:52.000000000 +0100
-+++ xemacs-21.5.24/man/Makefile	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/man/Makefile
+===================================================================
+--- xemacs-21.5.29.orig/man/Makefile
+++ xemacs-21.5.29/man/Makefile
@@ -20,6 +20,8 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
@ -242,9 +242,10 @@ diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile
 SHELL    = /bin/sh
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base64/Makefile
--- xemacs-21.5.24.orig/modules/base64/Makefile	2001-04-12 20:22:33.000000000 +0200
-+++ xemacs-21.5.24/modules/base64/Makefile	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/modules/base64/Makefile
+===================================================================
+--- xemacs-21.5.29.orig/modules/base64/Makefile
+++ xemacs-21.5.29/modules/base64/Makefile
@@ -7,6 +7,8 @@
 # 'installed'.
 #
@ -254,9 +255,10 @@ diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base
 SHELL=/bin/sh
 RM=rm -f
 CC=../../lib-src/ellcc
-diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modules/common/Makefile.common
--- xemacs-21.5.24.orig/modules/common/Makefile.common	2005-12-27 18:11:58.000000000 +0100
-+++ xemacs-21.5.24/modules/common/Makefile.common	2005-12-27 19:01:49.000000000 +0100
+Index: xemacs-21.5.29/modules/common/Makefile.common
+===================================================================
+--- xemacs-21.5.29.orig/modules/common/Makefile.common
+++ xemacs-21.5.29/modules/common/Makefile.common
@@ -31,6 +31,8 @@
 #define NOT_C_CODE
 #include "../../src/config.h"
@ -266,7 +268,7 @@ diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modul
 SHELL=/bin/sh
 RM=rm -f
 PROGNAME=@PROGNAME@
-@@ -98,7 +100,7 @@
+@@ -98,7 +100,7 @@ extraclean: realclean
 	-$(RM) *~ \#*
 
 install: $(OBJECT_TO_BUILD)
@ -275,9 +277,10 @@ diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modul
 
 ##
 ## Local Variables:
-diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/Makefile
--- xemacs-21.5.24.orig/modules/zlib/Makefile	2001-04-12 20:22:40.000000000 +0200
-+++ xemacs-21.5.24/modules/zlib/Makefile	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/modules/zlib/Makefile
+===================================================================
+--- xemacs-21.5.29.orig/modules/zlib/Makefile
+++ xemacs-21.5.29/modules/zlib/Makefile
@@ -8,6 +8,8 @@
 # 'installed'.
 #
@ -287,9 +290,10 @@ diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/M
 SHELL=/bin/sh
 RM=rm -f
 CC=../../lib-src/ellcc
-diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall/Makefile.in.in
--- xemacs-21.5.24.orig/netinstall/Makefile.in.in	2005-12-27 18:11:58.000000000 +0100
-+++ xemacs-21.5.24/netinstall/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/netinstall/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/netinstall/Makefile.in.in
+++ xemacs-21.5.29/netinstall/Makefile.in.in
@@ -14,6 +14,8 @@
 ##
 ## Makefile for Cygwin installer
@ -299,7 +303,7 @@ diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall
 ## For performance and consistency, no built-in rules
 .SUFFIXES:
 .SUFFIXES: .c .cc .h .o
-@@ -172,7 +174,7 @@
+@@ -173,7 +175,7 @@ setup-bin.ini:
 install:
 	@echo; echo "Installing net setup."
 	for file in ${INSTALLABLES} ; do \
@ -308,10 +312,11 @@ diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall
 	done
 
 version.c : $(srcdir)/ChangeLog Makefile
-diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.in
--- xemacs-21.5.24.orig/src/Makefile.in.in	2005-12-27 18:12:02.000000000 +0100
-+++ xemacs-21.5.24/src/Makefile.in.in	2005-12-27 19:00:48.000000000 +0100
-@@ -39,6 +39,8 @@
+Index: xemacs-21.5.29/src/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/src/Makefile.in.in
+++ xemacs-21.5.29/src/Makefile.in.in
+@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS=
 RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
 #endif
 
@ -320,7 +325,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
 PROGNAME=@PROGNAME@
 prefix=@prefix@
 SRC=@srcdir@
-@@ -1068,7 +1070,7 @@
+@@ -1065,7 +1067,7 @@ relock:
 #ifdef HAVE_SHLIB
 MAKEPATH=../lib-src/make-path
 install: $(PROGNAME)
@ -329,7 +334,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
 	-@echo "Copying include files for ellcc..."
 	-@hdir=`pwd`; \
 	cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
-@@ -1082,12 +1084,12 @@
+@@ -1079,12 +1081,12 @@ install: $(PROGNAME)
 		test -d s && hdrtars="$$hdrtars s/*"; \
 		test -d m && hdrtars="$$hdrtars m/*"; \
 		test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
@ -348,9 +353,10 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
 	done)
 #endif
 
-diff -ru xemacs-21.5.24.orig/tests/tooltalk/Makefile xemacs-21.5.24/tests/tooltalk/Makefile
--- xemacs-21.5.24.orig/tests/tooltalk/Makefile	1996-12-18 23:44:15.000000000 +0100
-+++ xemacs-21.5.24/tests/tooltalk/Makefile	2005-12-27 19:00:48.000000000 +0100
+Index: xemacs-21.5.29/tests/tooltalk/Makefile
+===================================================================
+--- xemacs-21.5.29.orig/tests/tooltalk/Makefile
+++ xemacs-21.5.29/tests/tooltalk/Makefile
@@ -12,6 +12,8 @@
 
 ### Code:
--- a/do-not-create-backups-in-temp-directories.patch
+++ b/do-not-create-backups-in-temp-directories.patch
@ -1,9 +1,10 @@
-diff -ru xemacs-21.5.21.orig/lisp/files.el xemacs-21.5.21/lisp/files.el
--- xemacs-21.5.21.orig/lisp/files.el	2005-04-08 16:07:00.000000000 +0200
-+++ xemacs-21.5.21/lisp/files.el	2005-06-07 21:25:23.000000000 +0200
-@@ -166,7 +166,9 @@
- Checks for files in `temporary-file-directory' or
- `small-temporary-file-directory'."
+Index: xemacs-21.5.29/lisp/files.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/files.el
+++ xemacs-21.5.29/lisp/files.el
+@@ -166,7 +166,9 @@ This variable is relevant only if `backu
+ Checks for files in the directory returned by `temp-directory' or specified
+ by `small-temporary-file-directory'."
   (let ((temporary-file-directory (temp-directory)))
 -    (not (or (let ((comp (compare-strings temporary-file-directory 0 nil
 +    (not (or (null name)
--- a/fix-defface-custom-modified-face.patch
+++ b/fix-defface-custom-modified-face.patch
@ -1,11 +1,8 @@
 Index: lisp/cus-edit.el
 ===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cus-edit.el,v
-retrieving revision 1.24
-diff -u -r1.24 cus-edit.el
--- lisp/cus-edit.el	2007/06/21 13:39:10	1.24
-+++ lisp/cus-edit.el	2007/08/03 15:45:25
-@@ -1346,7 +1346,7 @@
+--- lisp/cus-edit.el.orig
+++ lisp/cus-edit.el
+@@ -1395,7 +1395,7 @@ item in another window.\n\n"))
 (defface custom-modified-face '((((class color))
 				 (:foreground "white" :background "blue"))
 				(t
--- a/fix-window-configuration-problem.patch
+++ b/fix-window-configuration-problem.patch
@ -1,22 +0,0 @@
-diff --git a/src/window.c b/src/window.c
--- a/src/window.c
-+++ b/src/window.c
-@@ -3601,7 +3601,17 @@
- 	  /* All but the last window should have a height which is
-              a multiple of the default line height. */
- 	  if (!NILP (c->next))
-	    pos = (pos / line_size) * line_size;
-+	    {
-+	      /*
-+	       * Round up when we're shrinking, down when we're growing
-+	       * to make sure that pairs of grow / shrink meant to
-+	       * cancel out actually do cancel out.
-+	       */
-+	      if (pixel_adj_left < 0)
-+		pos = ((pos + line_size -1) / line_size) * line_size;
-+	      else
-+		pos = (pos / line_size) * line_size;
-+	    }
- 
- 	  /* Avoid confusion: don't delete child if it becomes too small */
- 	  set_window_pixsize (child, pos + first - last_pos, 1, set_height);
--- a/menus-always-utf8.patch
+++ b/menus-always-utf8.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/lwlib/xlwmenu.c
--- xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c	2008-04-01 19:40:35.000000000 +0200
-+++ xemacs-21.5.28.20080401/lwlib/xlwmenu.c	2009-01-21 18:01:16.000000000 +0100
-@@ -332,12 +332,12 @@
+Index: xemacs-21.5.29/lwlib/xlwmenu.c
+===================================================================
+--- xemacs-21.5.29.orig/lwlib/xlwmenu.c
+++ xemacs-21.5.29/lwlib/xlwmenu.c
+@@ -344,12 +344,12 @@ string_width (XlwMenuWidget mw,
 #else
 # ifdef USE_XFONTSET
   XRectangle ri, rl;
@ -16,7 +17,7 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 		   strlen (s), &glyphinfo);
   return glyphinfo.xOff;
 #else
-@@ -424,11 +424,11 @@
+@@ -436,11 +436,11 @@ string_width_u (XlwMenuWidget mw,
   return width;
 #else
 # ifdef USE_XFONTSET
@ -30,7 +31,7 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 		   j, &glyphinfo);
   return glyphinfo.xOff;
 #else
-@@ -758,7 +758,7 @@
+@@ -770,7 +770,7 @@ x_xft_text_width (Display *dpy, XftFont
 {
   static XGlyphInfo glyphinfo;
 
@ -39,7 +40,7 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 		   xft_font,
 		   (FcChar8 *) run, len, &glyphinfo);
   return glyphinfo.xOff;
-@@ -805,12 +805,12 @@
+@@ -817,12 +817,12 @@ string_draw (XlwMenuWidget mw,
 	       x_xft_text_width (display, renderFont, string, strlen (string)),
 	       renderFont->ascent + renderFont->descent);  /* XXX */
   /* draw text */
@ -54,7 +55,7 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 	       x, y + mw->menu.font_ascent, string, strlen (string));
 #  else
   XDrawString (XtDisplay (mw), window, gc,
-@@ -866,10 +866,10 @@
+@@ -878,10 +878,10 @@ string_draw_range (
 
 	if (end <= start)
 		return 0;
@ -67,7 +68,7 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 		mw->menu.font_set, &string[start], end - start, &ri, &rl);
 	return rl.width;
 # else
-@@ -892,12 +892,12 @@
+@@ -904,12 +904,12 @@ string_draw_range (
 					   renderFont, &string[start], end - start),
 			 renderFont->ascent + renderFont->descent);  /* XXX */
 	    /* draw text */
@ -83,4 +84,3 @@ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/l
 
 	    /* #### should use parent frame's .xftDraw */
 	    XftDrawDestroy (xftDraw);
-xemacs-21.5.28.20080401/lwlibだけに発見: xlwmenu.c.~1~
--- a/ndbm.patch
+++ b/ndbm.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.28.20080401//configure.ac xemacs-21.5.28.20080401.new//configure.ac
--- xemacs-21.5.28.20080401//configure.ac	2008-04-01 19:40:34.000000000 +0200
-+++ xemacs-21.5.28.20080401.new//configure.ac	2008-04-02 14:21:16.000000000 +0200
-@@ -5411,8 +5411,8 @@
+Index: xemacs-21.5.29/configure.ac
+===================================================================
+--- xemacs-21.5.29.orig/configure.ac
+++ xemacs-21.5.29/configure.ac
+@@ -5419,8 +5419,8 @@ fi
 
 dnl Check for DBM support in libgdbm.
 if test "$enable_database_gdbm" != "no"; then
@ -12,4 +13,3 @@ diff -ru xemacs-21.5.28.20080401//configure.ac xemacs-21.5.28.20080401.new//conf
        AC_CHECK_LIB(gdbm_compat, dbm_open, [
        enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
    if test "$enable_database_gdbm" = "yes"; then
-xemacs-21.5.28.20080401.new/だけに発見: configure.ac.~1~
--- a/set-language-unicode-precedence-list.patch
+++ b/set-language-unicode-precedence-list.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.28.20070730.orig/lisp/mule/chinese.el xemacs-21.5.28.20070730/lisp/mule/chinese.el
--- xemacs-21.5.28.20070730.orig/lisp/mule/chinese.el	2007-07-30 12:55:39.000000000 +0200
-+++ xemacs-21.5.28.20070730/lisp/mule/chinese.el	2007-08-01 14:58:39.000000000 +0200
-@@ -221,7 +221,24 @@
+Index: xemacs-21.5.29/lisp/mule/chinese.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/mule/chinese.el
+++ xemacs-21.5.29/lisp/mule/chinese.el
+@@ -223,7 +223,24 @@ G2: Sisheng (PinYin - ZhuYin)"
 
 (set-language-info-alist
  "Chinese-GB" '((setup-function . setup-chinese-gb-environment-internal)
@ -27,7 +28,7 @@ diff -ru xemacs-21.5.28.20070730.orig/lisp/mule/chinese.el xemacs-21.5.28.200707
 		(coding-system cn-gb-2312 iso-2022-7bit hz-gb-2312)
 		(coding-priority cn-gb-2312 big5 iso-2022-7bit)
 		(cygwin-locale "zh")
-@@ -291,7 +310,24 @@
+@@ -297,7 +314,24 @@ of a Chinese character\"."))
 (set-charset-ccl-program 'chinese-big5-2 'ccl-encode-big5-font)
 
 (set-language-info-alist
@ -53,10 +54,11 @@ diff -ru xemacs-21.5.28.20070730.orig/lisp/mule/chinese.el xemacs-21.5.28.200707
 		  (coding-system big5 iso-2022-7bit)
 		  (coding-priority big5 cn-gb-2312 iso-2022-7bit)
 		  (cygwin-locale "zh_TW")
-diff -ru xemacs-21.5.28.20070730.orig/lisp/mule/japanese.el xemacs-21.5.28.20070730/lisp/mule/japanese.el
--- xemacs-21.5.28.20070730.orig/lisp/mule/japanese.el	2007-07-26 15:22:13.000000000 +0200
-+++ xemacs-21.5.28.20070730/lisp/mule/japanese.el	2007-08-01 14:54:11.000000000 +0200
-@@ -368,8 +368,24 @@
+Index: xemacs-21.5.29/lisp/mule/japanese.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/mule/japanese.el
+++ xemacs-21.5.29/lisp/mule/japanese.el
+@@ -378,8 +378,24 @@ a similar structure:
  "Japanese" '((setup-function . setup-japanese-environment-internal)
 	      (exit-function . exit-japanese-environment)
 	      (tutorial . "TUTORIAL.ja")
--- a/set-locale-to-c-when-not-supported-by-x.patch
+++ b/set-locale-to-c-when-not-supported-by-x.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.25.20060327.orig/src/intl.c xemacs-21.5.25.20060327/src/intl.c
--- xemacs-21.5.25.20060327.orig/src/intl.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.25.20060327/src/intl.c	2006-03-27 17:06:52.000000000 +0200
-@@ -84,8 +84,10 @@
+Index: xemacs-21.5.29/src/intl.c
+===================================================================
+--- xemacs-21.5.29.orig/src/intl.c
+++ xemacs-21.5.29/src/intl.c
+@@ -84,8 +84,10 @@ Otherwise, returns the locale, or possib
 #ifdef HAVE_X_WINDOWS
   if (!init_x_locale (locale))
     {
@ -14,4 +15,3 @@ diff -ru xemacs-21.5.25.20060327.orig/src/intl.c xemacs-21.5.25.20060327/src/int
       setlocale (LC_NUMERIC, "C");
       free (loc);
       return Qnil;
-
--- a/unitialized-variables.patch
+++ b/unitialized-variables.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.25.20060327.orig/src/extents.c xemacs-21.5.25.20060327/src/extents.c
--- xemacs-21.5.25.20060327.orig/src/extents.c	2006-03-27 13:37:34.000000000 +0200
-+++ xemacs-21.5.25.20060327/src/extents.c	2006-03-27 17:24:00.000000000 +0200
-@@ -3121,6 +3121,10 @@
+Index: xemacs-21.5.29/src/extents.c
+===================================================================
+--- xemacs-21.5.29.orig/src/extents.c
+++ xemacs-21.5.29/src/extents.c
+@@ -3119,6 +3119,10 @@ extent_fragment_update (struct window *w
 	    
 	    gb.glyph = glyph;
 	    gb.extent = wrap_extent (e);
@ -12,7 +13,7 @@ diff -ru xemacs-21.5.25.20060327.orig/src/extents.c xemacs-21.5.25.20060327/src/
 	    Dynarr_add (ef->begin_glyphs, gb);
 	  }
 	  else if (EQ (glyph, last_glyph))
-@@ -3140,6 +3144,10 @@
+@@ -3138,6 +3142,10 @@ extent_fragment_update (struct window *w
 
 	    gb.glyph = glyph;
 	    gb.extent = wrap_extent (e);
@ -23,4 +24,3 @@ diff -ru xemacs-21.5.25.20060327.orig/src/extents.c xemacs-21.5.25.20060327/src/
 	    Dynarr_add (ef->end_glyphs, gb);
 	  }
 	  else if (EQ (glyph, last_glyph))
-
--- a/xaw3d-config.patch
+++ b/xaw3d-config.patch
@ -1,23 +0,0 @@
--- configure.ac
-+++ configure.ac
-@@ -4236,17 +4236,17 @@ if test "$with_x11" = "yes" -a "$detect_
-     AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
-       [
-         dnl Must not be a 3d library...
-        AC_CHECK_LIB($athena_variant, threeDClassRec,
-+        AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB,
-           [AC_MSG_WARN([Could not find a non-3d Athena widget library.])],
-           athena_lib=$athena_variant)
-       ],
-       AC_MSG_WARN([Could not find an Athena widget library.]))
-   else
-     dnl The real configuration, need 3d library
-    AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant,
-+    AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant,
-       dnl OK, couldn't find it with a proper name, try the standard Athena lib
-       dnl If that is 3d, presume the user asked for what they have installed.
-      AC_CHECK_LIB(Xaw, threeDClassRec,
-+      AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB,
-         [
-           athena_lib=Xaw;
-           AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
--- a/xemacs-21.4.13-ppc.patch
+++ b/xemacs-21.4.13-ppc.patch
@ -1,6 +1,8 @@
--- xemacs-21.4.13/src/ppc.ldscript.ppc	2004-01-20 15:49:25.000000000 +0100
-+++ xemacs-21.4.13/src/ppc.ldscript	2004-01-20 15:49:48.000000000 +0100
-@@ -66,6 +66,15 @@
+Index: xemacs-21.5.29/src/ppc.ldscript
+===================================================================
+--- xemacs-21.5.29.orig/src/ppc.ldscript
+++ xemacs-21.5.29/src/ppc.ldscript
+@@ -66,6 +66,15 @@ SECTIONS
      that no actual memory is lost; the page which is skipped can not
      be referenced).  */
   . = .;
--- a/xemacs-21.4.13-ppc64.patch
+++ b/xemacs-21.4.13-ppc64.patch
@ -1,5 +1,7 @@
--- xemacs-21.4.13/src/m/powerpc64.h.ppc64	2004-01-21 10:11:35.000000000 +0100
-+++ xemacs-21.4.13/src/m/powerpc64.h	2004-01-21 10:11:35.000000000 +0100
+Index: xemacs-21.5.29/src/m/powerpc64.h
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/src/m/powerpc64.h
@@ -0,0 +1,86 @@
 +/* machine description file for PowerPC 64-bit.
 +   Copyright (C) 1994, 2001, 2002 Free Software Foundation, Inc.
@ -87,9 +89,11 @@
 +
 +#undef LIB_STANDARD
 +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
--- xemacs-21.4.13/src/vm-limit.c.ppc64	2004-01-21 14:35:11.000000000 +0100
-+++ xemacs-21.4.13/src/vm-limit.c	2004-01-21 14:35:57.000000000 +0100
-@@ -59,6 +59,14 @@
+Index: xemacs-21.5.29/src/vm-limit.c
+===================================================================
+--- xemacs-21.5.29.orig/src/vm-limit.c
+++ xemacs-21.5.29/src/vm-limit.c
+@@ -61,6 +61,14 @@ check_memory_limits (void)
   unsigned long data_size;
   void (*save_warn_fun) (const char *);
 
--- a/xemacs-21.4.8-xevent.patch
+++ b/xemacs-21.4.8-xevent.patch
@ -1,7 +1,9 @@
--- src/event-Xt.c
-+++ src/event-Xt.c	2003-09-02 17:39:09.000000000 +0200
-@@ -1249,9 +1249,13 @@
- 	       However, "F1" normally does. */
+Index: src/event-Xt.c
+===================================================================
+--- src/event-Xt.c.orig
+++ src/event-Xt.c
+@@ -1224,9 +1224,13 @@ x_event_to_emacs_event (XEvent *x_event,
+ 
 	    if (modifiers & XEMACS_MOD_SHIFT)
 	      {
 -		int Mode_switch_p = *state & xd->ModeMask;
--- a/xemacs-21.5.28.20080401.tar.bz2
+++ b/xemacs-21.5.28.20080401.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e42fb71e344da1d8493743d6667c494b17e17f6fcca4d779221248e01f5d5277
-size 10202726
--- a/xemacs-21.5.29.tar.bz2
+++ b/xemacs-21.5.29.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50627ee71e69dfbf818494f6701e7e07767f4ceafad20ad1a57c60f48119002a
+size 12547703
--- a/xemacs-app-defaults.patch
+++ b/xemacs-app-defaults.patch
@ -1,16 +1,17 @@
-diff -ru xemacs-21.5.28.20080401.orig//etc/Emacs.ad xemacs-21.5.28.20080401/etc/Emacs.ad
--- xemacs-21.5.28.20080401.orig//etc/Emacs.ad	2008-04-01 19:40:34.000000000 +0200
-+++ xemacs-21.5.28.20080401/etc/Emacs.ad	2009-02-23 14:10:15.000000000 +0100
+Index: xemacs-21.5.29/etc/Emacs.ad
+===================================================================
+--- xemacs-21.5.29.orig/etc/Emacs.ad
+++ xemacs-21.5.29/etc/Emacs.ad
@@ -41,6 +41,17 @@
 ! Note that by default, the pointer foreground and background are the same
 ! as the default face.
 
 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 +! Fonts for Xft:
-+XEmacs*Tabs.fcFontName: sans-serif
-+XEmacs*menubar.fcFontName: sans-serif
-+XEmacs*modeline.attributeFont: sans-serif
-+XEmacs*default.attributeFont: sans-serif
+XEmacs.Tabs.fcFontName: sans-serif
+XEmacs.menubar.fcFontName: sans-serif:size=10
+XEmacs.modeline.attributeFont: sans-serif
+XEmacs.default.attributeFont: sans-serif
 +
 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 +!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
--- a/xemacs-configure.patch
+++ b/xemacs-configure.patch
@ -1,10 +0,0 @@
--- configure.ac
-+++ configure.ac
-@@ -387,6 +387,7 @@ dnl ------------------------------------
- dnl
- dnl Internal macro to recursively expand all the options in the option list.
- dnl
-+m4_define([m4_fst], [$1])
- define([XE_EXPAND_COMPLEX_OPTIONS],
- [m4_if([$2], [], [],
-        [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
--- a/xemacs-ia64.dif
+++ b/xemacs-ia64.dif
--- a/xemacs-level3.patch
+++ b/xemacs-level3.patch
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.20.orig/src/event-Xt.c xemacs-21.5.20/src/event-Xt.c
--- xemacs-21.5.20.orig/src/event-Xt.c	2005-01-25 00:33:52.000000000 +0100
-+++ xemacs-21.5.20/src/event-Xt.c	2005-05-12 12:37:18.000000000 +0200
-@@ -646,8 +646,17 @@
+Index: xemacs-21.5.29/src/event-Xt.c
+===================================================================
+--- xemacs-21.5.29.orig/src/event-Xt.c
+++ xemacs-21.5.29/src/event-Xt.c
+@@ -515,8 +515,17 @@ x_key_is_modifier_p (KeyCode keycode, st
   syms = &xd->x_keysym_map [(keycode - xd->x_keysym_map_min_code) *
 			   xd->x_keysym_map_keysyms_per_code];
   for (i = 0; i < xd->x_keysym_map_keysyms_per_code; i++)
@ -21,7 +22,7 @@ diff -ru xemacs-21.5.20.orig/src/event-Xt.c xemacs-21.5.20/src/event-Xt.c
       return 1;
   return 0;
 }
-@@ -997,8 +1006,17 @@
+@@ -872,8 +881,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve
          than passing in 0) to avoid crashes on German IRIX */
       char dummy[256];
       XLookupString (event, dummy, 200, &keysym, 0);
@ -41,7 +42,7 @@ diff -ru xemacs-21.5.20.orig/src/event-Xt.c xemacs-21.5.20/src/event-Xt.c
     }
 #endif /* ! XIM_MOTIF */
 
-@@ -1048,8 +1066,17 @@
+@@ -932,8 +950,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve
     {
     case XLookupKeySym:
     case XLookupBoth:
@ -61,10 +62,11 @@ diff -ru xemacs-21.5.20.orig/src/event-Xt.c xemacs-21.5.20/src/event-Xt.c
 
     case XLookupChars:
       {
-diff -ru xemacs-21.5.20.orig/src/xintrinsic.h xemacs-21.5.20/src/xintrinsic.h
--- xemacs-21.5.20.orig/src/xintrinsic.h	2001-04-12 20:24:30.000000000 +0200
-+++ xemacs-21.5.20/src/xintrinsic.h	2005-05-12 12:37:18.000000000 +0200
-@@ -22,6 +22,7 @@
+Index: xemacs-21.5.29/src/xintrinsic.h
+===================================================================
+--- xemacs-21.5.29.orig/src/xintrinsic.h
+++ xemacs-21.5.29/src/xintrinsic.h
+@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef INCLUDED_xintrinsic_h_
 #define INCLUDED_xintrinsic_h_
 
--- a/xemacs-ptmx.dif
+++ b/xemacs-ptmx.dif
@ -1,7 +1,8 @@
-diff -ru xemacs-21.5.20.orig/src/process-unix.c xemacs-21.5.20/src/process-unix.c
--- xemacs-21.5.20.orig/src/process-unix.c	2005-02-04 05:06:34.000000000 +0100
-+++ xemacs-21.5.20/src/process-unix.c	2005-05-11 17:41:30.000000000 +0200
-@@ -236,12 +236,6 @@
+Index: xemacs-21.5.29/src/process-unix.c
+===================================================================
+--- xemacs-21.5.29.orig/src/process-unix.c
+++ xemacs-21.5.29/src/process-unix.c
+@@ -236,12 +236,6 @@ allocate_pty (void)
       "/dev/ptmx_bsd"   /* Tru64 */
     };
 
@ -14,7 +15,7 @@ diff -ru xemacs-21.5.20.orig/src/process-unix.c xemacs-21.5.20/src/process-unix.
 
 #if defined(HAVE_OPENPTY) /* BSD, Tru64, glibc */
   {
-@@ -275,6 +269,13 @@
+@@ -275,6 +269,13 @@ allocate_pty (void)
     goto have_slave_name;
 #endif /* HAVE__GETPTY */
 
@ -28,4 +29,3 @@ diff -ru xemacs-21.5.20.orig/src/process-unix.c xemacs-21.5.20/src/process-unix.
   /* Master clone devices are available on most systems */
   {
     int i;
-
--- a/xemacs.changes
+++ b/xemacs.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 16 15:15:32 CEST 2009 - coolo@novell.com
+
+- update to beta29 (http://xemacs.org/Releases/21.5.29.html)
+   no too many changes since the cvs snapshot  
+- remove patches that went upstream (or where taken from there)
+- disable pdump for now
+
 -------------------------------------------------------------------
 Mon Feb 23 12:26:40 CET 2009 - maiku.fabian@gmail.com

--- a/xemacs.patch
+++ b/xemacs.patch
@ -1,6 +1,7 @@
-diff -Nru xemacs-21.5.20.orig/.pkgextract xemacs-21.5.20/.pkgextract
--- xemacs-21.5.20.orig/.pkgextract	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/.pkgextract	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/.pkgextract
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/.pkgextract
@@ -0,0 +1,12 @@
 +(cd ../; tar xkfI xemacs-21.4.3-info.tar.bz2)
 +rm -f    mule-packages
@ -14,10 +15,11 @@ diff -Nru xemacs-21.5.20.orig/.pkgextract xemacs-21.5.20/.pkgextract
 +patch -p0 -s --suffix=.mc  < ../xemacs-sumo-2000-09-04-mc.patch
 +patch -p0 -s --suffix=.conf  < ../xemacs-21.4.3-autoconf.patch
 +find lisp/ etc/ -name '*.elc' | xargs -r rm -f
-diff -Nru xemacs-21.5.20.orig/lib-src/gnuclient.c xemacs-21.5.20/lib-src/gnuclient.c
--- xemacs-21.5.20.orig/lib-src/gnuclient.c	2004-12-07 00:23:41.000000000 +0100
-+++ xemacs-21.5.20/lib-src/gnuclient.c	2005-05-12 14:38:20.000000000 +0200
-@@ -223,7 +223,7 @@
+Index: xemacs-21.5.29/lib-src/gnuclient.c
+===================================================================
+--- xemacs-21.5.29.orig/lib-src/gnuclient.c
+++ xemacs-21.5.29/lib-src/gnuclient.c
+@@ -226,7 +226,7 @@ filename_expand (char *fullpath, char *f
 /* Encase the string in quotes, escape all the backslashes and quotes
    in string.  */
 static char *
@ -26,10 +28,11 @@ diff -Nru xemacs-21.5.20.orig/lib-src/gnuclient.c xemacs-21.5.20/lib-src/gnuclie
 {
   int i = 0;
   char *p, *res;
-diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode.c
--- xemacs-21.5.20.orig/lib-src/mmencode.c	2001-08-13 06:45:48.000000000 +0200
-+++ xemacs-21.5.20/lib-src/mmencode.c	2005-05-12 14:38:20.000000000 +0200
-@@ -20,6 +20,11 @@
+Index: xemacs-21.5.29/lib-src/mmencode.c
+===================================================================
+--- xemacs-21.5.29.orig/lib-src/mmencode.c
+++ xemacs-21.5.29/lib-src/mmencode.c
+@@ -23,6 +23,11 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
 #include <string.h>
 #include <errno.h>
 
@ -41,7 +44,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 static void
 output64chunk(int c1, int c2, int c3, int pads, FILE *outfile);
 
-@@ -427,6 +432,32 @@
+@@ -430,6 +435,32 @@ fromqp(FILE *infile, FILE *outfile, char
     }    
 }
 
@ -74,7 +77,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 
 /*
 Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-@@ -453,6 +484,7 @@
+@@ -456,6 +487,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
 int main(int argc, char *argv[])
 {
     int encode = 1, which = BASE64, i, portablenewlines = 0;
@ -82,7 +85,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
     FILE *fp = stdin;
     FILE *fpo = stdout;
 
-@@ -464,7 +496,7 @@
+@@ -467,7 +499,7 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "mimencode: -o requires a file name.\n");
 			exit(-1);
 		    }
@ -91,7 +94,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 		    if (!fpo) {
 			perror(argv[i]);
 			exit(-1);
-@@ -497,7 +529,7 @@
+@@ -500,7 +532,7 @@ int main(int argc, char *argv[])
                 setmode(fileno(fpo), O_BINARY);
             } /* else */
 #else
@ -100,7 +103,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 #endif /* WIN32_NATIVE */
             if (!fp) {
                 perror(argv[i]);
-@@ -507,6 +539,12 @@
+@@ -510,6 +542,12 @@ int main(int argc, char *argv[])
     }
 #ifdef WIN32_NATIVE
     if (fp == stdin) setmode(fileno(fp), O_BINARY);
@ -113,10 +116,11 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 #endif /* WIN32_NATIVE */
     if (which == BASE64) {
         if (encode) {
-diff -Nru xemacs-21.5.20.orig/lib-src/pop.c xemacs-21.5.20/lib-src/pop.c
--- xemacs-21.5.20.orig/lib-src/pop.c	2004-09-20 21:19:11.000000000 +0200
-+++ xemacs-21.5.20/lib-src/pop.c	2005-05-12 14:38:20.000000000 +0200
-@@ -129,16 +129,20 @@
+Index: xemacs-21.5.29/lib-src/pop.c
+===================================================================
+--- xemacs-21.5.29.orig/lib-src/pop.c
+++ xemacs-21.5.29/lib-src/pop.c
+@@ -129,16 +129,20 @@ static char *find_crlf (char *, int);
 #define POP_PORT 110
 #define KPOP_PORT 1109
 #if defined(WIN32_NATIVE) || defined(CYGWIN)
@ -144,10 +148,11 @@ diff -Nru xemacs-21.5.20.orig/lib-src/pop.c xemacs-21.5.20/lib-src/pop.c
 #endif
 
 char pop_error[ERROR_MAX];
-diff -Nru xemacs-21.5.20.orig/lib-src/vcdiff xemacs-21.5.20/lib-src/vcdiff
--- xemacs-21.5.20.orig/lib-src/vcdiff	1996-12-18 23:42:33.000000000 +0100
-+++ xemacs-21.5.20/lib-src/vcdiff	2005-05-12 14:38:20.000000000 +0200
-@@ -62,6 +62,17 @@
+Index: xemacs-21.5.29/lib-src/vcdiff
+===================================================================
+--- xemacs-21.5.29.orig/lib-src/vcdiff
+++ xemacs-21.5.29/lib-src/vcdiff
+@@ -62,6 +62,17 @@ esac
 
 
 rev1= rev2= status=0
@ -165,7 +170,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/vcdiff xemacs-21.5.20/lib-src/vcdiff
 trap 'status=2; exit' 1 2 13 15
 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
 
-@@ -79,14 +90,12 @@
+@@ -79,14 +90,12 @@ do
 	case $f in
 	s.* | */s.*)
 		if
@ -180,9 +185,10 @@ diff -Nru xemacs-21.5.20.orig/lib-src/vcdiff xemacs-21.5.20/lib-src/vcdiff
 				get -s -p -k $sid2 "$f" > $rev2
 				workfile=$rev2
 			esac
-diff -Nru xemacs-21.5.20.orig/lisp/default.el xemacs-21.5.20/lisp/default.el
--- xemacs-21.5.20.orig/lisp/default.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/lisp/default.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/lisp/default.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/lisp/default.el
@@ -0,0 +1,9 @@
 +;(require 'tex-site)
 +(setq-default TeX-master nil)
@ -193,10 +199,11 @@ diff -Nru xemacs-21.5.20.orig/lisp/default.el xemacs-21.5.20/lisp/default.el
 +;    Autom. Auc-TeX-Macros
 +; (setq TeX-auto-private    "~/lib/xemacs/site-lisp/auctex/auto/")
 +
-diff -Nru xemacs-21.5.20.orig/lisp/dumped-lisp.el xemacs-21.5.20/lisp/dumped-lisp.el
--- xemacs-21.5.20.orig/lisp/dumped-lisp.el	2005-02-10 04:26:15.000000000 +0100
-+++ xemacs-21.5.20/lisp/dumped-lisp.el	2005-05-12 14:38:20.000000000 +0200
-@@ -38,6 +38,7 @@
+Index: xemacs-21.5.29/lisp/dumped-lisp.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/dumped-lisp.el
+++ xemacs-21.5.29/lisp/dumped-lisp.el
+@@ -38,6 +38,7 @@ in dumped-lisp.el and is not itself list
        "cl"
        "cl-extra"
        "cl-seq"
@ -204,18 +211,19 @@ diff -Nru xemacs-21.5.20.orig/lisp/dumped-lisp.el xemacs-21.5.20/lisp/dumped-lis
        "widget"
        "custom"		; Before the world so everything can be
 			; customized
-@@ -310,6 +311,7 @@
+@@ -303,6 +304,7 @@ in dumped-lisp.el and is not itself list
+         ;;     "sun-eos-debugger-extra"
         ;;     "sun-eos-menubar"))
-        "loadhist"		; Must be dumped before loaddefs is loaded
        "loaddefs"		; <=== autoloads get loaded here
 +       "disp-table"
 	))
 
 (setq preloaded-file-list
-diff -Nru xemacs-21.5.20.orig/lisp/find-paths.el xemacs-21.5.20/lisp/find-paths.el
--- xemacs-21.5.20.orig/lisp/find-paths.el	2005-01-15 16:17:36.000000000 +0100
-+++ xemacs-21.5.20/lisp/find-paths.el	2005-05-12 14:42:37.000000000 +0200
-@@ -325,7 +325,7 @@
+Index: xemacs-21.5.29/lisp/find-paths.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/find-paths.el
+++ xemacs-21.5.29/lisp/find-paths.el
+@@ -338,7 +338,7 @@ DEFAULT is the preferred value."
 
 (defun construct-emacs-version-name ()
   "Construct a string from the raw XEmacs version number."
@ -224,22 +232,24 @@ diff -Nru xemacs-21.5.20.orig/lisp/find-paths.el xemacs-21.5.20/lisp/find-paths.
 
 (defun paths-directories-which-exist (directories)
   "Return the directories among DIRECTORIES.
-diff -Nru xemacs-21.5.20.orig/lisp/mule/cyrillic.el xemacs-21.5.20/lisp/mule/cyrillic.el
--- xemacs-21.5.20.orig/lisp/mule/cyrillic.el	2002-03-21 08:30:21.000000000 +0100
-+++ xemacs-21.5.20/lisp/mule/cyrillic.el	2005-05-12 14:38:20.000000000 +0200
-@@ -32,6 +32,9 @@
- ;; Windows-1251 support deleted because XEmacs has automatic support.
+Index: xemacs-21.5.29/lisp/mule/cyrillic.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/mule/cyrillic.el
+++ xemacs-21.5.29/lisp/mule/cyrillic.el
+@@ -31,6 +31,9 @@
+ ;; converted to ISO8859-5 internally.
 
 ;;; Code:
 +(eval-when-compile
 +  (setq max-lisp-eval-depth (+ 800 max-lisp-eval-depth))
 +  (setq max-specpdl-size (+ 2000 max-specpdl-size)))
 
- ;; Cyrillic syntax
- (modify-syntax-entry 'cyrillic-iso8859-5 "w")
-diff -Nru xemacs-21.5.20.orig/lisp/site-init.el xemacs-21.5.20/lisp/site-init.el
--- xemacs-21.5.20.orig/lisp/site-init.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/lisp/site-init.el	2005-05-12 14:38:20.000000000 +0200
+ ;; Case table:
+ (loop
+Index: xemacs-21.5.29/lisp/site-init.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/lisp/site-init.el
@@ -0,0 +1,17 @@
 +;;;;
 +;;; xemacs-21.1.14/lisp/site-init.el
@ -258,10 +268,11 @@ diff -Nru xemacs-21.5.20.orig/lisp/site-init.el xemacs-21.5.20/lisp/site-init.el
 +(garbage-collect)
 +
 +;;; site-init.el ends here
-diff -Nru xemacs-21.5.20.orig/lisp/x-win-xfree86.el xemacs-21.5.20/lisp/x-win-xfree86.el
--- xemacs-21.5.20.orig/lisp/x-win-xfree86.el	2001-05-05 00:42:19.000000000 +0200
-+++ xemacs-21.5.20/lisp/x-win-xfree86.el	2005-05-12 14:38:20.000000000 +0200
-@@ -65,6 +65,10 @@
+Index: xemacs-21.5.29/lisp/x-win-xfree86.el
+===================================================================
+--- xemacs-21.5.29.orig/lisp/x-win-xfree86.el
+++ xemacs-21.5.29/lisp/x-win-xfree86.el
+@@ -101,6 +101,10 @@
       ;; define also the control, meta, and meta-control versions.
       (loop for mods in '(() (control) (meta) (meta control)) do
 	(define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)])
@ -274,9 +285,10 @@ diff -Nru xemacs-21.5.20.orig/lisp/x-win-xfree86.el xemacs-21.5.20/lisp/x-win-xf
 +;; End insert
 +)
 ;;; x-win-xfree86.el ends here
-diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el xemacs-21.5.20/site-packages/lisp/term/func-keys.el
--- xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/site-packages/lisp/term/func-keys.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/site-packages/lisp/term/func-keys.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/site-packages/lisp/term/func-keys.el
@@ -0,0 +1,101 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path in xemacs-21.4.12
@ -379,9 +391,10 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el xemacs-21.5.2
 +;;
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; End of func-keys.el
-diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/gnome.el xemacs-21.5.20/site-packages/lisp/term/gnome.el
--- xemacs-21.5.20.orig/site-packages/lisp/term/gnome.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/site-packages/lisp/term/gnome.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/site-packages/lisp/term/gnome.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/site-packages/lisp/term/gnome.el
@@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/gnome.el for site-lisp path in xemacs-21.1.7
@ -480,9 +493,10 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/gnome.el xemacs-21.5.20/si
 +(load "term/func-keys"  nil t)
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von gnome.el
-diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/kvt.el xemacs-21.5.20/site-packages/lisp/term/kvt.el
--- xemacs-21.5.20.orig/site-packages/lisp/term/kvt.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/site-packages/lisp/term/kvt.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/site-packages/lisp/term/kvt.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/site-packages/lisp/term/kvt.el
@@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/kvt.el for site-lisp path in xemacs-21.1.7
@ -581,9 +595,10 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/kvt.el xemacs-21.5.20/site
 +(load "term/func-keys"  nil t)
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von kvt.el
-diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/linux.el xemacs-21.5.20/site-packages/lisp/term/linux.el
--- xemacs-21.5.20.orig/site-packages/lisp/term/linux.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/site-packages/lisp/term/linux.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/site-packages/lisp/term/linux.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/site-packages/lisp/term/linux.el
@@ -0,0 +1,79 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/linux.el for site-lisp path in xemacs-21.1.7
@ -664,9 +679,10 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/linux.el xemacs-21.5.20/si
 +(load "term/func-keys" nil t)
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von linux.el
-diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/xterm.el xemacs-21.5.20/site-packages/lisp/term/xterm.el
--- xemacs-21.5.20.orig/site-packages/lisp/term/xterm.el	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/site-packages/lisp/term/xterm.el	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/site-packages/lisp/term/xterm.el
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/site-packages/lisp/term/xterm.el
@@ -0,0 +1,120 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/xterm.el for site-lisp path in xemacs-21.1.7
@ -788,10 +804,11 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/xterm.el xemacs-21.5.20/si
 +(load "term/func-keys"  nil t)
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von xterm.el
-diff -Nru xemacs-21.5.20.orig/src/Makefile.in.in xemacs-21.5.20/src/Makefile.in.in
--- xemacs-21.5.20.orig/src/Makefile.in.in	2005-03-10 10:05:52.000000000 +0100
-+++ xemacs-21.5.20/src/Makefile.in.in	2005-05-12 14:38:20.000000000 +0200
-@@ -555,7 +555,7 @@
+Index: xemacs-21.5.29/src/Makefile.in.in
+===================================================================
+--- xemacs-21.5.29.orig/src/Makefile.in.in
+++ xemacs-21.5.29/src/Makefile.in.in
+@@ -574,7 +574,7 @@ $(RAW_EXE): $(link_deps) $(DUMP_ID)
 	else \
 		$(CC) -c $(cflags) -DMAX_SIZE=0 $(SRC)/dump-data.c ;\
 	fi
@ -800,7 +817,7 @@ diff -Nru xemacs-21.5.20.orig/src/Makefile.in.in xemacs-21.5.20/src/Makefile.in.
 #endif
 
 ## (3) Update the .elc's needed for dumping
-@@ -585,7 +585,7 @@
+@@ -604,7 +604,7 @@ $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile
 	$(TEMACS_BATCH) -l $(LISP)/make-docfile.el -- \
 		-o $(LIB_SRC)/DOC -d $(SRC) -i $(LIB_SRC)/../site-packages \
 		$(obj_src) $(mallocdocsrc) $(rallocdocsrc) \
@ -809,10 +826,11 @@ diff -Nru xemacs-21.5.20.orig/src/Makefile.in.in xemacs-21.5.20/src/Makefile.in.
 
 ## (5) Dump
 
-diff -Nru xemacs-21.5.20.orig/src/print.c xemacs-21.5.20/src/print.c
--- xemacs-21.5.20.orig/src/print.c	2005-01-25 00:34:05.000000000 +0100
-+++ xemacs-21.5.20/src/print.c	2005-05-12 14:38:20.000000000 +0200
-@@ -1084,6 +1084,40 @@
+Index: xemacs-21.5.29/src/print.c
+===================================================================
+--- xemacs-21.5.29.orig/src/print.c
+++ xemacs-21.5.29/src/print.c
+@@ -1104,6 +1104,40 @@ float_to_string (char *buf, double data)
   Ibyte *cp, c;
   int width;
 
@ -853,10 +871,11 @@ diff -Nru xemacs-21.5.20.orig/src/print.c xemacs-21.5.20/src/print.c
   if (NILP (Vfloat_output_format)
       || !STRINGP (Vfloat_output_format))
   lose:
-diff -Nru xemacs-21.5.20.orig/src/regex.c xemacs-21.5.20/src/regex.c
--- xemacs-21.5.20.orig/src/regex.c	2005-03-09 05:59:31.000000000 +0100
-+++ xemacs-21.5.20/src/regex.c	2005-05-12 14:38:20.000000000 +0200
-@@ -1154,6 +1154,9 @@
+Index: xemacs-21.5.29/src/regex.c
+===================================================================
+--- xemacs-21.5.29.orig/src/regex.c
+++ xemacs-21.5.29/src/regex.c
+@@ -1154,6 +1154,9 @@ print_double_string (re_char *where, re_
    syntax, so it can be changed between regex compilations.  */
 /* This has no initializer because initialized variables in Emacs
    become read-only after dumping.  */
@ -866,10 +885,11 @@ diff -Nru xemacs-21.5.20.orig/src/regex.c xemacs-21.5.20/src/regex.c
 reg_syntax_t re_syntax_options;
 
 
-diff -Nru xemacs-21.5.20.orig/src/s/linux.h xemacs-21.5.20/src/s/linux.h
--- xemacs-21.5.20.orig/src/s/linux.h	2002-08-12 16:45:34.000000000 +0200
-+++ xemacs-21.5.20/src/s/linux.h	2005-05-12 14:38:20.000000000 +0200
-@@ -25,6 +25,7 @@
+Index: xemacs-21.5.29/src/s/linux.h
+===================================================================
+--- xemacs-21.5.29.orig/src/s/linux.h
+++ xemacs-21.5.29/src/s/linux.h
+@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define USG
 #define LINUX
@ -877,9 +897,10 @@ diff -Nru xemacs-21.5.20.orig/src/s/linux.h xemacs-21.5.20/src/s/linux.h
 
 /* powerpc gcc 2.8.0 doesn't define __ELF__, but it is */
 
-diff -Nru xemacs-21.5.20.orig/suse/README.SuSE xemacs-21.5.20/suse/README.SuSE
--- xemacs-21.5.20.orig/suse/README.SuSE	1970-01-01 01:00:00.000000000 +0100
-+++ xemacs-21.5.20/suse/README.SuSE	2005-05-12 14:38:20.000000000 +0200
+Index: xemacs-21.5.29/suse/README.SuSE
+===================================================================
+--- /dev/null
+++ xemacs-21.5.29/suse/README.SuSE
@@ -0,0 +1,18 @@
 +
 +   XEmacs-21.5.16
--- a/xemacs.spec
+++ b/xemacs.spec
@ -1,5 +1,5 @@
 #
-# spec file for package xemacs (Version 21.5.28.20080401)
+# spec file for package xemacs (Version 21.5.29)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -18,12 +18,7 @@


 Name:           xemacs
-BuildRequires:  canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xorg-x11 xorg-x11-devel
-%if %suse_version > 1020
-BuildRequires:  xaw3d-devel
-%else
-BuildRequires:  xaw3d
-%endif
+BuildRequires:  canna-devel compface db-devel fdupes fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel
 %if "%(xft-config --prefix)" == "/usr"
 %define	appdefdir  /usr/share/X11
 %define xbindir    /usr/bin
@ -38,13 +33,12 @@ BuildRequires:  xaw3d
 Url:            http://www.xemacs.org
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
-Obsoletes:      xe_exec
 PreReq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
-Version:        21.5.28.20080401
-Release:        61
+Version:        21.5.29
+Release:        1
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@ -93,19 +87,13 @@ Patch32:        do-not-create-backups-in-temp-directories.patch
 Patch33:        set-locale-to-c-when-not-supported-by-x.patch
 Patch34:        suppress-warning-about-undefined-unicode-key-mappings.patch
 Patch38:        unitialized-variables.patch
-Patch40:        cast-pointer-integer-different-size.patch
 Patch41:        bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch
 Patch42:        build-fix-ccl-load-problem.patch
 Patch43:        set-language-unicode-precedence-list.patch
 Patch45:        fix-defface-custom-modified-face.patch
-Patch47:        xaw3d-config.patch
-Patch48:        fix-window-configuration-problem.patch
-Patch49:        xemacs-configure.patch
 Patch50:        menus-always-utf8.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
-Patch432404:    bnc432404-bytecomp.diff
-Patch450838:    bnc450838-make-generic-print-buffer-work.patch

 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
@ -129,7 +117,6 @@ Authors:

 %package     -n xemacs-el
 License:        GPL v2 or later
-Obsoletes:      xe_lisp
 Requires:       xemacs xemacs-packages-el
 Summary:        Emacs-Lisp source files for XEmacs
 Group:          Productivity/Editors/Emacs
@ -152,7 +139,6 @@ Authors:

 %package     -n xemacs-info
 License:        GPL v2 or later
-Obsoletes:      xe_info
 Requires:       xemacs-packages-info
 Summary:        Info Files for XEmacs
 Group:          Productivity/Editors/Emacs
@ -190,25 +176,19 @@ Authors:
 %patch33 -p1
 #%patch34 -p1
 %patch38 -p1
-%patch40 -p1
-%patch41 -p1
+#%patch40 -p1
 #%patch42 -p1
 %patch43 -p1
 %patch45 -p0
-%patch47
-%patch48 -p1
-%patch49
 %patch50 -p1
 %patch292811 -p1
 %patch301352 -p1
-%patch432404 -p1
-%patch450838 -p1
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 %ifarch ia64
 %define enable_pdump 0
 %else
-%define enable_pdump 1
+%define enable_pdump 0
 %endif
 %define enable_dump_in_exec 0
 %define enable_xft 0%{?opensuse_bs}
@ -407,6 +387,8 @@ ver=%{version}
 test -x $RPM_BUILD_ROOT%{xbindir}/xemacs-${ver%%.*}-b${ver##*.} && \
    mv  $RPM_BUILD_ROOT%{xbindir}/xemacs-${ver%%.*}-b${ver##*.} $RPM_BUILD_ROOT%{xbindir}/xemacs
 chmod 1755 $RPM_BUILD_ROOT%{xbindir}/xemacs
+rm -f $RPM_BUILD_ROOT%{xbindir}/xemacs-script
+rm -rf $RPM_BUILD_ROOT/usr/share/xemacs/%{version}/etc/tests
 for f in $RPM_BUILD_ROOT/usr/man/man1/*.1 \
         $RPM_BUILD_ROOT/usr/share/man/man1/*.1 \
 	 $RPM_BUILD_ROOT/usr/share/xemacs/info/*info* \
@ -473,6 +455,7 @@ install -m 0644 suse/README.SuSE $RPM_BUILD_ROOT/%{_docdir}/xemacs/README.SuSE
 ln -sf  /usr/share/xemacs/%{version}/etc $RPM_BUILD_ROOT/%{_docdir}/xemacs/etc
 mkdir -p $RPM_BUILD_ROOT/etc/skel/.xemacs
 install -m 0644 $RPM_SOURCE_DIR/skel.init.el $RPM_BUILD_ROOT/etc/skel/.xemacs/init.el
+%fdupes $RPM_SOURCE_DIR/usr/share/xemacs
 #
 # replace buildroot in comments in .elc files by spaces with the same total length:
 RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr '[:print:]' ' ')
@ -598,6 +581,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/

 %changelog
+* Tue Jun 16 2009 coolo@novell.com
+- update to beta29 (http://xemacs.org/Releases/21.5.29.html)
+  no too many changes since the cvs snapshot
+- remove patches that went upstream (or where taken from there)
+- disable pdump for now
 * Mon Feb 23 2009 maiku.fabian@gmail.com
 - add menus-always-utf8.patch to make the menus work in UTF-8
  locales with Xft. The patch is not yet perfect, it doesn't yet
@ -796,7 +784,7 @@ rm -rf $RPM_BUILD_ROOT
  + remove fix-wrong-use-of-memset.patch (included upstream).
 * Tue Jul 18 2006 schwab@suse.de
 - Fix broken use of autoconf internal macros.
-* Wed Jun 14 2006 dmueller@suse.de
+* Thu Jun 15 2006 dmueller@suse.de
 - build parallel
 * Mon Mar 27 2006 mfabian@suse.de
 - update to 21.5.25.20060327 to make xemacs build on x86_64 again,
@ -905,13 +893,13 @@ rm -rf $RPM_BUILD_ROOT
 - update to 21.5.20.
 - jamie-zawinski-selection-fix.patch, aidan-kehoe-iso8859-16.patch
  not necessary anymore.
-* Mon Apr 25 2005 mfabian@suse.de
+* Tue Apr 26 2005 mfabian@suse.de
 - add workaround support for more unicode characters,
  especially for those needed for IPA.
 * Thu Apr 14 2005 mfabian@suse.de
 - Bugzilla #77957: add all characters from U+00A1 to U+00FF to
  preloaded-unicode-key-translations.
-* Sun Apr 03 2005 aj@suse.de
+* Mon Apr 04 2005 aj@suse.de
 - Fix GCC4 sentinel warnings.
 * Mon Mar 07 2005 mfabian@suse.de
 - add a few more characters to preloaded-unicode-key-translations
@ -942,7 +930,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 10 2005 mfabian@suse.de
 - remove configure option "--rel-alloc" because it makes
  XEmacs 21.5.18 often crash when using 'compile-goto-error'.
-* Fri Feb 04 2005 schwab@suse.de
+* Sat Feb 05 2005 schwab@suse.de
 - Fix format string bug in movemail.
 * Fri Feb 04 2005 werner@suse.de
 - Security fix for movemail applied (bug #50237)
@ -989,7 +977,7 @@ rm -rf $RPM_BUILD_ROOT
  incompatible to XEmacs and should never be read.
 - use -adobe-helvetica-bold-* instead of -gnu-unifont- by default
  for the menus because most users like it better.
-* Mon Mar 08 2004 mfabian@suse.de
+* Tue Mar 09 2004 mfabian@suse.de
 - adapt Werner's patch for xemacs 21.5.16.
 * Mon Mar 08 2004 werner@suse.de
 - Make workaround to a real fix: autoconf 2.59 does not accept
@ -1060,7 +1048,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix race condition when generating the file list.
 * Tue Jun 24 2003 ro@suse.de
 - added directories to filelist
-* Mon Jun 23 2003 ro@suse.de
+* Tue Jun 24 2003 ro@suse.de
 - fixed filelist
 * Thu Mar 13 2003 mfabian@suse.de
 - Bug #25300: call 'latin-unity-install' for non-UTF-8 locales in
@ -1367,7 +1355,7 @@ rm -rf $RPM_BUILD_ROOT
  * ispell menus
  * xterm/console key mappings
 	- Fix font menu: set `ignore scaled fonts' to nil
-* Fri Nov 05 1999 werner@suse.de
+* Sat Nov 06 1999 werner@suse.de
 - Change file list of xe_info and xe_lisp
 * Thu Nov 04 1999 werner@suse.de
 - Remove libgif from required packages