[xemacs] Update to 21.5.31. License is now GPLv3+. Drop upstreamed patches: x-paths, image-overflow, no-xft,
Jerry James
jjames at fedoraproject.org
Wed May 4 04:51:56 UTC 2011
commit 77761d7c199e2bc7aba57ca78b39b3efcf2eb538
Author: Jerry James <loganjerry at gmail.com>
Date: Tue May 3 20:37:36 2011 -0600
Update to 21.5.31.
License is now GPLv3+.
Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font,
etags-memmove, arabic, dired, and infodir.
Rebase and renumber remaining patches.
Drop workaround for ancient alternatives bug.
.gitignore | 2 +-
gnuclient.desktop | 2 +-
sources | 2 +-
xemacs-21.5.25-mk-nochk-features.patch | 6 +-
xemacs-21.5.25-wnnfix-128362.patch | 18 +-
xemacs-21.5.25-x-paths.patch | 22 ---
xemacs-21.5.26-utf8-fonts.patch | 10 +-
xemacs-21.5.27-no-expdyn-ia64-106744.patch | 54 +++----
xemacs-21.5.28-courier-default.patch | 12 +-
xemacs-21.5.29-arabic-547840.patch | 233 --------------------------
xemacs-21.5.29-destdir.patch | 249 +++++++++++-----------------
xemacs-21.5.29-dired-550145.patch | 28 ---
xemacs-21.5.29-etags-memmove-545399.patch | 31 ----
xemacs-21.5.29-image-overflow.patch | 83 ---------
xemacs-21.5.29-no-xft.patch | 39 -----
xemacs-21.5.29-png.patch | 133 ---------------
xemacs-21.5.29-tty-font-512623.patch | 133 ---------------
xemacs-21.5.29-x-server.patch | 7 +-
xemacs-beta-infodir.patch | 12 --
xemacs.spec | 96 ++++-------
20 files changed, 185 insertions(+), 987 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cecbdf8..e5004a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xemacs-21.5.29.tar.gz
+xemacs-21.5.31.tar.gz
diff --git a/gnuclient.desktop b/gnuclient.desktop
index 9dfdb5e..c06d946 100644
--- a/gnuclient.desktop
+++ b/gnuclient.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=XEmacs Client
+Name=Gnuclient
GenericName=Text Editor
Comment=Edit text
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
diff --git a/sources b/sources
index ad2d8ce..39e46de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5364192ae0d3de23d9f4ce197e6493b5 xemacs-21.5.29.tar.gz
+0185fe905d0b8d8d094d9b60cf262d4a xemacs-21.5.31.tar.gz
diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch
index 5dc625a..1adfa6b 100644
--- a/xemacs-21.5.25-mk-nochk-features.patch
+++ b/xemacs-21.5.25-mk-nochk-features.patch
@@ -1,6 +1,6 @@
---- xemacs-21.5.25/Makefile.in.in.orig 2005-12-31 14:41:23.000000000 +0200
-+++ xemacs-21.5.25/Makefile.in.in 2006-03-30 23:53:48.000000000 +0300
-@@ -387,7 +387,7 @@
+--- Makefile.in.in.orig 2011-04-29 07:31:05.000000000 -0600
++++ Makefile.in.in 2011-05-03 13:50:06.283333766 -0600
+@@ -391,7 +391,7 @@
install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
diff --git a/xemacs-21.5.25-wnnfix-128362.patch b/xemacs-21.5.25-wnnfix-128362.patch
index 6153740..0b64249 100644
--- a/xemacs-21.5.25-wnnfix-128362.patch
+++ b/xemacs-21.5.25-wnnfix-128362.patch
@@ -1,6 +1,6 @@
---- xemacs-21.5.25/src/mule-wnnfns.c.orig 2004-11-05 01:06:43.000000000 +0200
-+++ xemacs-21.5.25/src/mule-wnnfns.c 2006-03-31 00:20:37.000000000 +0300
-@@ -318,7 +318,7 @@
+--- src/mule-wnnfns.c.orig 2011-04-29 07:31:16.000000000 -0600
++++ src/mule-wnnfns.c 2011-05-03 14:00:02.625969757 -0600
+@@ -316,7 +316,7 @@
Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji;
Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko;
Lisp_Object Vwnn_server_type;
@@ -8,8 +8,8 @@
+//Lisp_Object Vcwnn_zhuyin;
Lisp_Object Vwnnenv_sticky;
Lisp_Object Vwnn_uniq_level;
- Fixnum lb_sisheng;
-@@ -1897,9 +1897,11 @@
+ Lisp_Object Qchinese_sisheng;
+@@ -1914,9 +1914,11 @@
DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /*
*jserver, cserver ..
*/ );
@@ -22,7 +22,7 @@
DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /*
*If non-nil, make environment sticky
*/ );
-@@ -1908,7 +1910,7 @@
+@@ -1925,7 +1927,7 @@
*/ );
Vwnn_server_type = Qjserver;
@@ -30,8 +30,8 @@
+ //Vcwnn_zhuyin = Qnil;
Vwnnenv_sticky = Qnil;
- Vwnn_uniq_level = Qwnn_uniq;
-@@ -1930,10 +1932,14 @@
+ DEFSYMBOL (Qchinese_sisheng);
+@@ -1952,10 +1954,14 @@
case 0x80:
if (EQ(Vwnn_server_type, Qcserver))
{
@@ -46,7 +46,7 @@
for (i = 0; i < len; i++)
{
if (pzy[i] & 0x80)
-@@ -2036,8 +2042,12 @@
+@@ -2055,8 +2061,12 @@
else *pin = *w;
w++; pin++;
}
diff --git a/xemacs-21.5.26-utf8-fonts.patch b/xemacs-21.5.26-utf8-fonts.patch
index 02b842b..ae0a2a8 100644
--- a/xemacs-21.5.26-utf8-fonts.patch
+++ b/xemacs-21.5.26-utf8-fonts.patch
@@ -1,6 +1,6 @@
---- xemacs-21.5.26/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200
-+++ xemacs-21.5.26/etc/Emacs.ad 2006-04-14 20:37:56.000000000 +0300
-@@ -198,8 +198,12 @@
+--- etc/Emacs.ad.orig 2011-04-29 07:31:05.000000000 -0600
++++ etc/Emacs.ad 2011-05-03 13:45:02.269991498 -0600
+@@ -222,8 +222,12 @@
! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0
!
@@ -15,7 +15,7 @@
*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
-*-*-*-*-*-*-*-120-*-iso10646-1, \
-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-@@ -211,7 +215,7 @@
+@@ -235,7 +239,7 @@
! Gui elements share this font
!
@@ -24,7 +24,7 @@
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
-@@ -227,7 +231,7 @@
+@@ -251,7 +255,7 @@
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch
index 6379255..225c168 100644
--- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch
+++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch
@@ -1,34 +1,28 @@
---- xemacs-21.5.27/aclocal.m4~ 2006-03-28 18:55:49.000000000 +0300
-+++ xemacs-21.5.27/aclocal.m4 2007-01-04 00:34:57.000000000 +0200
-@@ -549,11 +549,12 @@
- dnl usually need to be prefix with ${wl} or some other such thing.
- dnl
+--- ./configure.orig 2011-04-29 07:31:38.000000000 -0600
++++ ./configure 2011-05-03 13:57:42.432352166 -0600
+@@ -14638,7 +14638,10 @@
+ ;;
--if test "$xe_gnu_ld" = yes; then
-- if test "$ld_shlibs" = yes; then
+ *)
- ld_dynamic_link_flags="${wl}-export-dynamic"
-- fi
--fi
-+dnl dnl avoid -export-dynamic on ia64
-+dnl if test "$xe_gnu_ld" = yes; then
-+dnl if test "$ld_shlibs" = yes; then
-+dnl ld_dynamic_link_flags="${wl}-export-dynamic"
-+dnl fi
-+dnl fi
++ dnl avoid -export-dynamic on ia64
++ if test "$xehost_cpu" != "ia64"; then
++ ld_dynamic_link_flags="${wl}-export-dynamic"
++ fi
+ ;;
+ esac
+ fi
+--- ./aclocal.m4.orig 2011-04-29 07:31:05.000000000 -0600
++++ ./aclocal.m4 2011-05-03 13:56:08.899939431 -0600
+@@ -533,7 +533,10 @@
+ ;;
- if test -z "$ld_dynamic_link_flags"; then
- case "$xehost_os" in
---- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300
-+++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200
-@@ -22928,11 +22928,6 @@
- fi # End of if cc_produces_so = no
-
-
--if test "$xe_gnu_ld" = yes; then
-- if test "$ld_shlibs" = yes; then
+ *)
- ld_dynamic_link_flags="${wl}-export-dynamic"
-- fi
--fi
-
- if test -z "$ld_dynamic_link_flags"; then
- case "$xehost_os" in
++ dnl avoid -export-dynamic on ia64
++ if test "$xehost_cpu" != "ia64"; then
++ ld_dynamic_link_flags="${wl}-export-dynamic"
++ fi
+ ;;
+ esac
+ fi
diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch
index 0af7786..e8ffe1c 100644
--- a/xemacs-21.5.28-courier-default.patch
+++ b/xemacs-21.5.28-courier-default.patch
@@ -1,11 +1,11 @@
---- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000
-+++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000
-@@ -2411,7 +2411,7 @@
+--- src/faces.c.orig 2011-04-29 07:31:15.000000000 -0600
++++ src/faces.c 2011-05-03 14:07:19.571887005 -0600
+@@ -2426,7 +2426,7 @@
Fcons
(Fcons
(list1 (device_symbol),
-- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
-+ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
+- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
++ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
inst_list);
- #endif /* !USE_XFT */
+ #endif /* !HAVE_XFT */
diff --git a/xemacs-21.5.29-destdir.patch b/xemacs-21.5.29-destdir.patch
index 54d57b2..2686e27 100644
--- a/xemacs-21.5.29-destdir.patch
+++ b/xemacs-21.5.29-destdir.patch
@@ -1,28 +1,56 @@
-diff -up xemacs-21.5.29/dynodump/Makefile.in.in~ xemacs-21.5.29/dynodump/Makefile.in.in
---- xemacs-21.5.29/dynodump/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300
-+++ xemacs-21.5.29/dynodump/Makefile.in.in 2009-05-20 22:42:21.000000000 +0300
-@@ -22,6 +22,8 @@
-
- ## Synched up with: Not synched with FSF.
+--- ./src/Makefile.in.in.orig 2011-04-29 07:31:14.000000000 -0600
++++ ./src/Makefile.in.in 2011-05-03 14:09:39.714499623 -0600
+@@ -37,6 +37,8 @@
+ RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
+ #endif
+DESTDIR=
+
- ## For performance and consistency, no built-in rules.
- .SUFFIXES:
- .SUFFIXES: .c .o .i .h
-diff -up xemacs-21.5.29/etc/tests/external-widget/Makefile~ xemacs-21.5.29/etc/tests/external-widget/Makefile
---- xemacs-21.5.29/etc/tests/external-widget/Makefile~ 2009-05-18 17:51:05.000000000 +0300
-+++ xemacs-21.5.29/etc/tests/external-widget/Makefile 2009-05-20 22:42:23.000000000 +0300
-@@ -1,3 +1,5 @@
+ PROGNAME=@PROGNAME@
+ prefix=@prefix@
+ SRC=@srcdir@
+@@ -1019,7 +1021,7 @@
+ #ifdef HAVE_SHLIB
+ MAKEPATH=../lib-src/make-path
+ install: $(PROGNAME)
+- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s
++ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s
+ - at echo "Copying include files for ellcc..."
+ - at hdir=`pwd`; \
+ cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
+@@ -1033,12 +1035,12 @@
+ test -d s && hdrtars="$$hdrtars s/*"; \
+ test -d m && hdrtars="$$hdrtars m/*"; \
+ test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
+- (cd $(archlibdir)/include && umask 022 && tar xf -); \
+- chmod 755 $(archlibdir)/include; \
+- test -d $(archlibdir)/include/s && \
+- chmod 755 $(archlibdir)/include/s; \
+- test -d $(archlibdir)/include/m && \
+- chmod 755 $(archlibdir)/include/s;) \
++ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \
++ chmod 755 $(DESTDIR)$(archlibdir)/include; \
++ test -d $(DESTDIR)$(archlibdir)/include/s && \
++ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \
++ test -d $(DESTDIR)$(archlibdir)/include/m && \
++ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \
+ done)
+ #endif
+
+--- ./lwlib/Makefile.in.in.orig 2011-04-29 07:31:10.000000000 -0600
++++ ./lwlib/Makefile.in.in 2011-05-03 14:09:39.703499575 -0600
+@@ -21,6 +21,8 @@
+ ## along with the Lucid Widget Library. If not, see
+ ## <http://www.gnu.org/licenses/>.
+
+DESTDIR=
+
- CFLAGS += -Xc -g -DTOOLTALK
- EMACSHOME = ../../..
- EMACSLIBDIR = $(EMACSHOME)/editor/src
-diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile.in.in
---- xemacs-21.5.29/lib-src/Makefile.in.in~ 2009-05-18 17:51:06.000000000 +0300
-+++ xemacs-21.5.29/lib-src/Makefile.in.in 2009-05-20 22:42:25.000000000 +0300
-@@ -24,6 +24,8 @@
+ ## For performance and consistency, no built-in rules
+ .SUFFIXES:
+ .SUFFIXES: .c .h .o .i .s
+--- ./lib-src/Makefile.in.in.orig 2011-04-29 07:31:08.000000000 -0600
++++ ./lib-src/Makefile.in.in 2011-05-03 14:09:39.702499571 -0600
+@@ -22,6 +22,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? */
@@ -31,7 +59,7 @@ diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile.
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .h .o
-@@ -246,26 +248,26 @@ do-blessmail: $(blessmail)
+@@ -242,26 +244,26 @@
## just run them directly from lib-src.
${archlibdir}: all
@echo; echo "Installing utilities run internally by XEmacs."
@@ -63,22 +91,42 @@ diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile.
done
uninstall:
-diff -up xemacs-21.5.29/lwlib/Makefile.in.in~ xemacs-21.5.29/lwlib/Makefile.in.in
---- xemacs-21.5.29/lwlib/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/lwlib/Makefile.in.in 2009-05-20 22:42:27.000000000 +0300
-@@ -22,6 +22,8 @@
- ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- ## Boston, MA 02111-1307, USA.
+--- ./tests/tooltalk/Makefile.orig 2011-04-29 07:31:17.000000000 -0600
++++ ./tests/tooltalk/Makefile 2011-05-03 14:09:39.715499628 -0600
+@@ -27,6 +27,8 @@
+
+ ### Code:
+DESTDIR=
+
- ## For performance and consistency, no built-in rules
- .SUFFIXES:
- .SUFFIXES: .c .h .o .i .s
-diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
---- xemacs-21.5.29/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300
-+++ xemacs-21.5.29/Makefile.in.in 2009-05-20 22:42:17.000000000 +0300
-@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS=
+ CC = cc -Xc
+ CPPFLAGS = -I/usr/openwin/include
+ CFLAGS = -g -v -DNeedFunctionPrototypes
+--- ./man/Makefile.orig 2011-04-29 07:31:11.000000000 -0600
++++ ./man/Makefile 2011-05-03 14:09:39.711499611 -0600
+@@ -18,6 +18,8 @@
+ # You should have received a copy of the GNU General Public License
+ # along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR=
++
+ SHELL = /bin/sh
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+--- ./etc/tests/external-widget/Makefile.orig 2011-04-29 07:31:06.000000000 -0600
++++ ./etc/tests/external-widget/Makefile 2011-05-03 14:10:13.269646148 -0600
+@@ -16,6 +16,8 @@
+ ## You should have received a copy of the GNU General Public License
+ ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR=
++
+ CFLAGS += -Xc -g -DTOOLTALK
+ EMACSHOME = ../../..
+ EMACSLIBDIR = $(EMACSHOME)/editor/src
+--- ./Makefile.in.in.orig 2011-05-03 13:50:06.283333766 -0600
++++ ./Makefile.in.in 2011-05-03 14:15:27.424015117 -0600
+@@ -59,6 +59,8 @@
RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
#endif
@@ -87,7 +135,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
SHELL = /bin/sh
LANG = C
LC_ALL = C
-@@ -394,37 +396,37 @@ install-arch-dep: mkdir
+@@ -398,43 +400,43 @@
(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir}) ; done
@@ -135,15 +183,6 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
# endif /* CYGWIN */
#endif /* WIN32_NATIVE */
- if test "${prefix}" != "${exec_prefix}"; then \
-- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
-+ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \
- for dir in \
- lib/${inststaticdir} \
- lib/${instvardir}/etc \
-@@ -435,13 +437,13 @@ install-arch-dep: mkdir
- done; \
- fi
#ifdef HAVE_SHLIB
- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir)
+ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir)
@@ -157,7 +196,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
"`(cd $${dir} && $(pwd))`"; then \
: do nothing - echo "rm -rf $$1" ; \
fi ; \
-@@ -449,35 +451,35 @@ install-arch-indep: mkdir info
+@@ -442,35 +444,35 @@
done
-set ${COPYDESTS} ; \
for dir in ${COPYDESTS} ; do \
@@ -205,7 +244,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
done
@echo "If you would like to save approximately 4M of disk space, do"
@echo "make gzip-el"
-@@ -487,19 +489,23 @@ install-arch-indep: mkdir info
+@@ -480,19 +482,23 @@
@echo "${lispdir}"
gzip-el:
@@ -234,22 +273,20 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in
## Install bundled packages, if present.
-diff -up xemacs-21.5.29/man/Makefile~ xemacs-21.5.29/man/Makefile
---- xemacs-21.5.29/man/Makefile~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/man/Makefile 2009-05-20 22:42:28.000000000 +0300
-@@ -20,6 +20,8 @@
- # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- # Boston, MA 02111-1307, USA.
+--- ./modules/base64/Makefile.orig 2011-04-29 07:31:12.000000000 -0600
++++ ./modules/base64/Makefile 2011-05-03 14:09:39.712499615 -0600
+@@ -25,6 +25,8 @@
+ # 'installed'.
+ #
+DESTDIR=
+
- SHELL = /bin/sh
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
-diff -up xemacs-21.5.29/modules/base64/Makefile~ xemacs-21.5.29/modules/base64/Makefile
---- xemacs-21.5.29/modules/base64/Makefile~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/modules/base64/Makefile 2009-05-20 22:42:29.000000000 +0300
-@@ -7,6 +7,8 @@
+ SHELL=/bin/sh
+ RM=rm -f
+ CC=../../lib-src/ellcc
+--- ./modules/zlib/Makefile.orig 2011-04-29 07:31:13.000000000 -0600
++++ ./modules/zlib/Makefile 2011-05-03 14:09:39.713499619 -0600
+@@ -26,6 +26,8 @@
# 'installed'.
#
@@ -258,10 +295,9 @@ diff -up xemacs-21.5.29/modules/base64/Makefile~ xemacs-21.5.29/modules/base64/M
SHELL=/bin/sh
RM=rm -f
CC=../../lib-src/ellcc
-diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/common/Makefile.common
---- xemacs-21.5.29/modules/common/Makefile.common~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/modules/common/Makefile.common 2009-05-20 22:42:31.000000000 +0300
-@@ -31,6 +31,8 @@
+--- ./modules/common/Makefile.common.orig 2011-04-29 07:31:12.000000000 -0600
++++ ./modules/common/Makefile.common 2011-05-03 14:09:39.712499615 -0600
+@@ -29,6 +29,8 @@
#define NOT_C_CODE
#include "../../src/config.h"
@@ -270,7 +306,7 @@ diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/c
SHELL=/bin/sh
RM=rm -f
PROGNAME=@PROGNAME@
-@@ -98,7 +100,7 @@ extraclean: realclean
+@@ -96,7 +98,7 @@
-$(RM) *~ \#*
install: $(OBJECT_TO_BUILD)
@@ -279,88 +315,3 @@ diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/c
##
## Local Variables:
-diff -up xemacs-21.5.29/modules/zlib/Makefile~ xemacs-21.5.29/modules/zlib/Makefile
---- xemacs-21.5.29/modules/zlib/Makefile~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/modules/zlib/Makefile 2009-05-20 22:42:33.000000000 +0300
-@@ -8,6 +8,8 @@
- # 'installed'.
- #
-
-+DESTDIR=
-+
- SHELL=/bin/sh
- RM=rm -f
- CC=../../lib-src/ellcc
-diff -up xemacs-21.5.29/netinstall/Makefile.in.in~ xemacs-21.5.29/netinstall/Makefile.in.in
---- xemacs-21.5.29/netinstall/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300
-+++ xemacs-21.5.29/netinstall/Makefile.in.in 2009-05-20 22:42:34.000000000 +0300
-@@ -14,6 +14,8 @@
- ##
- ## Makefile for Cygwin installer
-
-+DESTDIR=
-+
- ## For performance and consistency, no built-in rules
- .SUFFIXES:
- .SUFFIXES: .c .cc .h .o
-@@ -173,7 +175,7 @@ setup-bin.ini:
- install:
- @echo; echo "Installing net setup."
- for file in ${INSTALLABLES} ; do \
-- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
-+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \
- done
-
- version.c : $(srcdir)/ChangeLog Makefile
-diff -up xemacs-21.5.29/src/Makefile.in.in~ xemacs-21.5.29/src/Makefile.in.in
---- xemacs-21.5.29/src/Makefile.in.in~ 2009-05-18 17:51:08.000000000 +0300
-+++ xemacs-21.5.29/src/Makefile.in.in 2009-05-20 22:42:36.000000000 +0300
-@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS=
- RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
- #endif
-
-+DESTDIR=
-+
- PROGNAME=@PROGNAME@
- prefix=@prefix@
- SRC=@srcdir@
-@@ -1065,7 +1067,7 @@ relock:
- #ifdef HAVE_SHLIB
- MAKEPATH=../lib-src/make-path
- install: $(PROGNAME)
-- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s
-+ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s
- - at echo "Copying include files for ellcc..."
- - at hdir=`pwd`; \
- cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
-@@ -1079,12 +1081,12 @@ install: $(PROGNAME)
- test -d s && hdrtars="$$hdrtars s/*"; \
- test -d m && hdrtars="$$hdrtars m/*"; \
- test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
-- (cd $(archlibdir)/include && umask 022 && tar xf -); \
-- chmod 755 $(archlibdir)/include; \
-- test -d $(archlibdir)/include/s && \
-- chmod 755 $(archlibdir)/include/s; \
-- test -d $(archlibdir)/include/m && \
-- chmod 755 $(archlibdir)/include/s;) \
-+ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \
-+ chmod 755 $(DESTDIR)$(archlibdir)/include; \
-+ test -d $(DESTDIR)$(archlibdir)/include/s && \
-+ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \
-+ test -d $(DESTDIR)$(archlibdir)/include/m && \
-+ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \
- done)
- #endif
-
-diff -up xemacs-21.5.29/tests/tooltalk/Makefile~ xemacs-21.5.29/tests/tooltalk/Makefile
---- xemacs-21.5.29/tests/tooltalk/Makefile~ 2009-05-18 17:51:10.000000000 +0300
-+++ xemacs-21.5.29/tests/tooltalk/Makefile 2009-05-20 22:42:15.000000000 +0300
-@@ -12,6 +12,8 @@
-
- ### Code:
-
-+DESTDIR=
-+
- CC = cc -Xc
- CPPFLAGS = -I/usr/openwin/include
- CFLAGS = -g -v -DNeedFunctionPrototypes
diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch
index 2ff022f..ea69c92 100644
--- a/xemacs-21.5.29-x-server.patch
+++ b/xemacs-21.5.29-x-server.patch
@@ -1,7 +1,6 @@
-diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el
---- xemacs-21.5.29.ORIG/lisp/x-init.el 2009-05-18 08:51:07.000000000 -0600
-+++ xemacs-21.5.29/lisp/x-init.el 2010-07-06 12:07:24.064305596 -0600
-@@ -243,7 +243,7 @@
+--- lisp/x-init.el.orig 2011-04-29 07:31:10.000000000 -0600
++++ lisp/x-init.el 2011-05-03 14:24:00.865240901 -0600
+@@ -242,7 +242,7 @@
(string-equal "X Consortium" vendor))
;; Ok, we think this could be a Sun keyboard. Run the Sun code.
(x-win-init-sun device))
diff --git a/xemacs.spec b/xemacs.spec
index 1f1bd8e..20fc075 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -20,12 +20,12 @@
%global majver 21.5
Name: xemacs
-Version: 21.5.29
-Release: 18%{?snap:.%{snap}}%{?dist}
+Version: 21.5.31
+Release: 1%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
-License: GPLv2+
+License: GPLv3+
URL: http://www.xemacs.org/
%if 0%{?snap:1}
Source0: %{name}-%{snap}.tar.xz
@@ -39,30 +39,13 @@ Source4: default.el
Source5: xemacs-sitestart.el
Source6: gnuclient.desktop
-Patch0: %{name}-21.5.26-utf8-fonts.patch
-Patch1: %{name}-21.5.25-x-paths.patch
-# Applied upstream 2009-07-01
-Patch2: %{name}-21.5.29-image-overflow.patch
-Patch3: %{name}-21.5.25-mk-nochk-features.patch
-Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch
-Patch5: %{name}-21.5.25-wnnfix-128362.patch
-# Proposed by upstream 2009-08-25
-Patch6: %{name}-21.5.29-no-xft.patch
-# Applied upstream 2009-09-23
-Patch7: %{name}-21.5.29-png.patch
-Patch8: %{name}-21.5.28-courier-default.patch
-Patch9: %{name}-21.5.29-destdir.patch
-# Sent upstream 2009-10-28
-Patch10: %{name}-21.5.29-tty-font-512623.patch
-# Sent upstream 2009-12-08
-Patch11: %{name}-21.5.29-etags-memmove-545399.patch
-# Applied upstream 2009-12-21
-Patch12: %{name}-21.5.29-arabic-547840.patch
-# Applied upstream 2009-01-07
-Patch13: %{name}-21.5.29-dired-550145.patch
-# Sent upstream 2009-03-12
-Patch14: %{name}-beta-infodir.patch
-Patch15: %{name}-21.5.29-x-server.patch
+Patch0: %{name}-21.5.25-mk-nochk-features.patch
+Patch1: %{name}-21.5.25-wnnfix-128362.patch
+Patch2: %{name}-21.5.26-utf8-fonts.patch
+Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch
+Patch4: %{name}-21.5.28-courier-default.patch
+Patch5: %{name}-21.5.29-destdir.patch
+Patch6: %{name}-21.5.29-x-server.patch
BuildRequires: autoconf
BuildRequires: sed >= 3.95
@@ -75,6 +58,7 @@ BuildRequires: libjpeg-devel
BuildRequires: compface-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
+BuildRequires: giflib-devel
BuildRequires: desktop-file-utils
%if %{with mule}
BuildRequires: Canna-devel
@@ -108,12 +92,8 @@ Requires: xorg-x11-fonts-ISO8859-1-100dpi
Requires: xorg-x11-fonts-misc
Requires(post): chkconfig
Requires(post): coreutils
-Requires(post): desktop-file-utils
-Requires(post): gtk2
Requires(postun): chkconfig
Requires(postun): coreutils
-Requires(postun): desktop-file-utils
-Requires(postun): gtk2
Provides: xemacs(bin) = %{version}-%{release}
%global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
@@ -253,33 +233,22 @@ add functionality to XEmacs.
find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f
rm -f configure.in
sed -i -e /tetris/d lisp/menubar-items.el
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%ifarch ia64
-touch -r aclocal.m4 aclocal.m4-stamp
-%patch4 -p1
-touch -r aclocal.m4-stamp aclocal.m4
-%endif
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
-autoconf --force # for DESTDIR patch
+autoconf --force # for DESTDIR and NO-EXPDYN-IA64 patches
for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do
- iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+ iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f
+ touch -r $f $f.utf8
+ mv -f $f.utf8 $f
done
@@ -341,7 +310,7 @@ mv src/xemacs{,-nox-%{xver}}
mv lib-src/config.values{,-nox}
mv Installation{,-nox}
# grab these from -nox, the X ones may have deps on ALSA, X, etc
-for file in {e,oo}tags gnuserv {fake,move}mail yow ; do
+for file in {e,oo}tags gnuserv {fake,move}mail ; do
mv lib-src/$file{,-mindep}
done
%endif # nox
@@ -515,7 +484,7 @@ find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh
rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1}
cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
-rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1
+rm -r InstallGuide tests XKeysymDB *.1
cd -
# separate files
@@ -549,12 +518,9 @@ rm -rf $RPM_BUILD_ROOT
%post
-# rm because alternatives won't overwrite pre-alternatives symlink, bug?
-rm -f %{_bindir}/xemacs && \
%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
%{_bindir}/xemacs-%{xver} 80
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-:
%postun
[ -e %{_bindir}/xemacs-%{xver} ] || \
@@ -564,15 +530,12 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
-:
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post nox
-# rm because alternatives won't overwrite pre-alternatives symlink, bug?
-rm -f %{_bindir}/xemacs && \
%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
%{_bindir}/xemacs-nox-%{xver} 40 || :
@@ -581,8 +544,6 @@ rm -f %{_bindir}/xemacs && \
%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || :
%post xft
-# rm because alternatives won't overwrite pre-alternatives symlink, bug?
-rm -f %{_bindir}/xemacs && \
%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
%{_bindir}/xemacs-xft-%{xver} 40 || :
@@ -656,7 +617,6 @@ fi
%files common -f base-files
%defattr(-,root,root,-)
%doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
-%doc etc/editclient.sh
%{_bindir}/etags.xemacs
%{_bindir}/ootags
%{_bindir}/xemacs-script
@@ -709,6 +669,14 @@ fi
%dir %{_datadir}/xemacs/site-packages/pkginfo
%changelog
+* Tue May 3 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-1
+- Update to 21.5.31
+- License is now GPLv3+
+- Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font,
+ etags-memmove, arabic, dired, infodir
+- Rebase and renumber remaining patches
+- Drop workaround for ancient alternatives bug
+
* Tue Mar 1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-18
- Make -filesystem subpackage be noarch.
More information about the scm-commits
mailing list