[xemacs] Build --with-union-type to avoid a make-int bug in lisp-disunion.h. Add view-mode patch (bz 709399).

[Jerry James]

commit 6099603d63374537e11dc98b537f7445faad9a04
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Aug 5 13:23:03 2011 -0600

    Build --with-union-type to avoid a make-int bug in lisp-disunion.h.
    Add view-mode patch (bz 709399).
    Add get-other-frame patch from upstream.
    Add lib-src patch to eliminate unnecessary linkage.

 xemacs-21.5.31-get-other-frame.patch |   11 +++++++++++
 xemacs-21.5.31-lib-src.patch         |   20 ++++++++++++++++++++
 xemacs-21.5.31-view-mode.patch       |   10 ++++++++++
 xemacs.spec                          |   29 ++++++++++++++++++++++++++++-
 4 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/xemacs-21.5.31-get-other-frame.patch b/xemacs-21.5.31-get-other-frame.patch
new file mode 100644
index 0000000..6abfcfc
--- /dev/null
+++ b/xemacs-21.5.31-get-other-frame.patch
@@ -0,0 +1,11 @@
+--- lisp/frame.el.orig	2011-04-29 07:31:09.000000000 -0600
++++ lisp/frame.el	2011-08-05 12:13:03.208221581 -0600
+@@ -602,7 +602,7 @@
+ 	 (next (next-frame this 'visible-nomini)))
+     ;; then search iconified frames
+     (if (eq this next)
+-	(setq next (next-frame 'visible-iconic-nomini)))
++	(setq next (next-frame this 'visible-iconic-nomini)))
+     (if (eq this next)
+ 	;; otherwise, make a new frame
+ 	(make-frame)
diff --git a/xemacs-21.5.31-lib-src.patch b/xemacs-21.5.31-lib-src.patch
new file mode 100644
index 0000000..3c8792f
--- /dev/null
+++ b/xemacs-21.5.31-lib-src.patch
@@ -0,0 +1,20 @@
+--- lib-src/Makefile.in.in.orig	2011-08-05 12:04:52.445736351 -0600
++++ lib-src/Makefile.in.in	2011-08-05 13:02:14.244239350 -0600
+@@ -191,7 +191,7 @@
+ ## when #include'ing generated files.
+ cppflags = -I. -I../src -I$(srcdir) -I$(top_srcdir)/src $(CPPFLAGS)
+ cflags   = $(CFLAGS) $(cppflags) $(c_switch_general)
+-ldflags  = $(LDFLAGS) $(ld_switch_general) $(ld_libs_general)
++ldflags  = $(LDFLAGS) $(ld_switch_general)
+ 
+ ## This is the default compilation command.
+ ## But we should never rely on it, because some make version
+@@ -382,7 +382,7 @@
+ #endif /* not DUMP_IN_EXEC */
+ 
+ cflags_gnuserv  = $(CFLAGS) $(cppflags) $(c_switch_all)
+-ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) @libs_xauth@ $(ld_libs_general)
++ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) -lXau
+ gnuslib.o: ${srcdir}/gnuslib.c ${srcdir}/gnuserv.h ../src/config.h
+ 	$(CC) -c $(cflags_gnuserv) ${srcdir}/gnuslib.c
+ gnuclient: ${srcdir}/gnuclient.c gnuslib.o ${srcdir}/gnuserv.h
diff --git a/xemacs-21.5.31-view-mode.patch b/xemacs-21.5.31-view-mode.patch
new file mode 100644
index 0000000..0013c23
--- /dev/null
+++ b/xemacs-21.5.31-view-mode.patch
@@ -0,0 +1,10 @@
+--- lisp/view-less.el.orig	2011-04-29 07:31:10.000000000 -0600
++++ lisp/view-less.el	2011-08-05 10:33:22.849657806 -0600
+@@ -103,6 +103,7 @@
+ (defcustom view-mode-line-string " View"
+   "*String to display in the modeline when View mode is active.
+ Set this to nil if you don't want a modeline indicator."
++  :group 'view
+   :type '(choice string
+ 		 (const :tag "none" nil)))
+ 
diff --git a/xemacs.spec b/xemacs.spec
index ea14455..af93f26 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.31
-Release:        1%{?snap:.%{snap}}%{?dist}
+Release:        2%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -39,13 +39,30 @@ Source4:        default.el
 Source5:        xemacs-sitestart.el
 Source6:        gnuclient.desktop
 
+# Fedora-specific.  Don't run the check-features Makefile target.  It checks
+# that necessary packages are installed, but they aren't installed while
+# building an RPM.
 Patch0:         %{name}-21.5.25-mk-nochk-features.patch
+# Experimental patch.  Fix WNN support.  This patch is no longer sufficient.
+# WNN still doesn't work.
 Patch1:         %{name}-21.5.25-wnnfix-128362.patch
+# Fedora-specific.  Don't force ISO-8859 fonts.
 Patch2:         %{name}-21.5.26-utf8-fonts.patch
+# Experimental patch, to be sent upstream eventually.  Don't use
+# -export-dynamic on IA64; leads to segfaults due to function pointer issues.
 Patch3:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
+# Fedora-specific.  Default to courier instead of lucidatypewriter.
 Patch4:         %{name}-21.5.28-courier-default.patch
+# Applied upstream.  Support DESTDIR in the Makefiles.
 Patch5:         %{name}-21.5.29-destdir.patch
+# Fedora-specific.  Recognize the Fedora X server.
 Patch6:         %{name}-21.5.29-x-server.patch
+# Applied upstream.  Give view-mode-line-string a custom group.
+Patch7:         %{name}-21.5.31-view-mode.patch
+# Applied upstream.  Supply a missing argument to next-frame.
+Patch8:         %{name}-21.5.31-get-other-frame.patch
+# Linux-specific patch.  Eliminate unnecessary linkage in lib-src binaries.
+Patch9:         %{name}-21.5.31-lib-src.patch
 
 BuildRequires:  autoconf
 BuildRequires:  sed >= 3.95
@@ -240,6 +257,9 @@ sed -i -e /tetris/d lisp/menubar-items.el
 %patch4
 %patch5
 %patch6
+%patch7
+%patch8
+%patch9
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
@@ -293,6 +313,7 @@ common_options="
     --with-debug
     --with-error-checking=none
     --enable-bignum=gmp
+    --with-union-type
 "
 
 %if %{with nox}
@@ -663,6 +684,12 @@ fi
 %dir %{_datadir}/xemacs/site-packages/pkginfo
 
 %changelog
+* Fri Aug  5 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-2
+- Build --with-union-type to avoid a make-int bug in lisp-disunion.h
+- Add view-mode patch (bz 709399)
+- Add get-other-frame patch from upstream
+- Add lib-src patch to eliminate unnecessary linkage
+
 * Tue May  3 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-1
 - Update to 21.5.31
 - License is now GPLv3+