From 9d44f45ad6143055e1a58b61e91eac090bf87a8a Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 14 Mar 2011 23:39:02 +0100 Subject: [PATCH] emacs: Updated (21.4a -> 23.3) --- editors/emacs/emacs.desc | 6 +- editors/emacs/gcc-4.0.patch | 30 ----- editors/emacs/no-ce-tags-man.patch | 23 ++-- editors/emacs/no-shared.patch | 43 ++----- editors/emacs/ppc-oddity.patch | 51 -------- editors/emacs/x86_64.patch | 182 ----------------------------- 6 files changed, 27 insertions(+), 308 deletions(-) delete mode 100644 editors/emacs/gcc-4.0.patch delete mode 100644 editors/emacs/ppc-oddity.patch delete mode 100644 editors/emacs/x86_64.patch diff --git a/editors/emacs/emacs.desc b/editors/emacs/emacs.desc index 9b422c0d6..4cf222886 100644 --- a/editors/emacs/emacs.desc +++ b/editors/emacs/emacs.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../emacs/emacs.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 21.4a +[V] 23.3 [P] X -----5---9 126.100 -[D] 295788882 emacs-21.4a.tar.gz ftp://ftp.gnu.org/pub/gnu/emacs/ +[D] 411997878 emacs-23.3.tar.gz ftp://ftp.gnu.org/pub/gnu/emacs/ diff --git a/editors/emacs/gcc-4.0.patch b/editors/emacs/gcc-4.0.patch deleted file mode 100644 index 6f5653509..000000000 --- a/editors/emacs/gcc-4.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../emacs/gcc-4.0.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Gcc-4.0 compile patch, imported from Fedora Core. - - - Rene Rebe - ---- emacs-21.3/lib-src/emacsclient.c~ 2002-12-04 21:38:25.000000000 +0900 -+++ emacs-21.3/lib-src/emacsclient.c 2005-03-18 20:21:50.542628565 +0900 -@@ -38,7 +38,6 @@ - #endif /* not VMS */ - - char *getenv (), *getwd (); --char *getcwd (); - - /* This is defined with -D from the compilation command, - which extracts it from ../lisp/version.el. */ diff --git a/editors/emacs/no-ce-tags-man.patch b/editors/emacs/no-ce-tags-man.patch index cc295d157..40e5bd207 100644 --- a/editors/emacs/no-ce-tags-man.patch +++ b/editors/emacs/no-ce-tags-man.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../emacs/no-ce-tags-man.patch +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -15,14 +16,14 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- emacs-21.3/Makefile.in.orig 2003-05-20 06:00:40.000000000 +0200 -+++ emacs-21.3/Makefile.in 2003-05-20 06:00:47.000000000 +0200 -@@ -448,7 +448,7 @@ - -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} - thisdir=`/bin/pwd`; \ - cd ${srcdir}/etc; \ -- for page in emacs etags ctags gfdl ; do \ -+ for page in emacs gfdl ; do \ - (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ - chmod a+r ${man1dir}/$${page}${manext}); \ +--- emacs-23.3/Makefile.in.orig 2011-03-14 23:29:49.436072237 +0100 ++++ emacs-23.3/Makefile.in 2011-03-14 23:31:01.692072235 +0100 +@@ -131,7 +131,7 @@ + # (and they contain cross-references that expect them to be there). + mandir=@mandir@ + man1dir=$(mandir)/man1 +-MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ ++MAN_PAGES=b2m.1 ebrowse.1 emacs.1 emacsclient.1 \ + grep-changelog.1 rcs-checkin.1 + + # Where to install and expect the info files describing Emacs. In the diff --git a/editors/emacs/no-shared.patch b/editors/emacs/no-shared.patch index f42466444..397e5a955 100644 --- a/editors/emacs/no-shared.patch +++ b/editors/emacs/no-shared.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../emacs/no-shared.patch +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -15,36 +16,16 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -diff -urN emacs-21.3/etc/Makefile emacs-21.3-fixed/etc/Makefile ---- emacs-21.3/etc/Makefile 1995-04-26 22:59:05.000000000 +0200 -+++ emacs-21.3-fixed/etc/Makefile 2003-03-29 02:05:11.000000000 +0100 -@@ -12,7 +12,7 @@ - clean distclean maintainer-clean: - -rm -f DOC* core +--- emacs-23.3/lib-src/Makefile.in.orig 2011-01-08 18:45:14.000000000 +0100 ++++ emacs-23.3/lib-src/Makefile.in 2011-03-13 14:42:27.392072238 +0100 +@@ -105,8 +105,8 @@ --SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \ -+SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* ledit.l ms-* \ - news.texi rc2log refcard.tex spook-lines termcap.* ulimit.hack \ - vcdiff vipcard.tex xmouse.doc + # Things that a user might actually run, + # which should be installed in bindir. +-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@ +-INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog ++INSTALLABLES = emacsclient${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@ ++INSTALLABLE_SCRIPTS = grep-changelog -diff -urN emacs-21.3/lib-src/Makefile.in emacs-21.3-fixed/lib-src/Makefile.in ---- emacs-21.3/lib-src/Makefile.in 2002-05-31 18:45:17.000000000 +0200 -+++ emacs-21.3-fixed/lib-src/Makefile.in 2003-03-29 02:03:28.000000000 +0100 -@@ -294,15 +294,8 @@ - - install: ${archlibdir} - @echo -- @echo "Installing utilities for users to run." -- for file in ${INSTALLABLES} ; do \ -- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \ -- chmod a+rx ${bindir}/$${file}; \ -- done -- for file in ${INSTALLABLE_SCRIPTS} ; do \ -- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ -- chmod a+rx ${bindir}/$${file}; \ -- done -+ @echo "Installing no utilities for users." -+ @echo "They are shared with emacs and in a seperate ROCK package." - - uninstall: - (cd ${bindir}; \ + # Things that Emacs runs internally, or during the build process, + # which should not be installed in bindir. diff --git a/editors/emacs/ppc-oddity.patch b/editors/emacs/ppc-oddity.patch deleted file mode 100644 index 602e0ed26..000000000 --- a/editors/emacs/ppc-oddity.patch +++ /dev/null @@ -1,51 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../emacs/ppc-oddity.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -To be able to build and run Emacs on PowerPC we need to wipe some strange -outdated ... assumptions ... - - - Rene Rebe - ---- emacs-21.3/src/m/macppc.h 2001-10-23 08:43:33.000000000 +0200 -+++ emacs-21.3/src/m/macppc.h 2003-09-26 22:26:59.000000000 +0200 -@@ -90,26 +90,9 @@ - #define HAVE_TEXT_START - #endif - --/* NAKAJI Hiroyuki says this is needed -- For MkLinux/LinuxPPC. */ - --#ifdef LINUX --#define LINKER $(CC) -nostdlib --#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc --/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here -- because prefix-args is not used. */ --#undef LD_SWITCH_SYSTEM_TEMACS --#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc --#endif -- --#if 0 /* This breaks things on PPC GNU/Linux ecept for Yellowdog, -- even with identical GCC, as, ld. Let's take it out until we -- know what's really going on here. */ --/* GCC 2.95 and newer on GNU/Linux PPC changed the load address to -- 0x10000000. */ - #if defined __linux__ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) - #define DATA_SEG_BITS 0x10000000 - #endif --#endif - #endif /* 0 */ diff --git a/editors/emacs/x86_64.patch b/editors/emacs/x86_64.patch deleted file mode 100644 index 8c7c996e7..000000000 --- a/editors/emacs/x86_64.patch +++ /dev/null @@ -1,182 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../emacs/x86_64.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -x86-64 support patch imported from Fedora Core - - - Rene Rebe - ---- emacs-21.2/configure.in~ 2002-11-05 18:26:11.000000000 +0900 -+++ emacs-21.2/configure.in 2002-11-05 18:26:11.000000000 +0900 -@@ -1052,6 +1055,11 @@ - machine=f301 opsys=uxpv - ;; - -+ ## AMD x86-64 Linux-based GNU system -+ x86_64-*-linux-gnu* ) -+ machine=amdx86-64 opsys=gnu-linux -+ ;; -+ - * ) - unported=yes - ;; ---- /dev/null 2002-11-06 15:24:04.000000000 +0900 -+++ emacs-21.2/src/m/amdx86-64.h 2002-11-06 15:24:04.000000000 +0900 -@@ -0,0 +1,131 @@ -+/* machine description file for AMD x86-64. -+ Copyright (C) 2002 Free Software Foundation, Inc. -+ -+This file is part of GNU Emacs. -+ -+GNU Emacs is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GNU Emacs is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GNU Emacs; see the file COPYING. If not, write to -+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+ -+/* The following line tells the configuration script what sort of -+ operating system this machine is likely to run. -+ USUAL-OPSYS="linux" */ -+ -+#define BITS_PER_LONG 64 -+#define BITS_PER_EMACS_INT 64 -+ -+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word -+ is the most significant byte. */ -+ -+#undef WORDS_BIG_ENDIAN -+ -+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a -+ * group of arguments and treat it as an array of the arguments. */ -+ -+#define NO_ARG_ARRAY -+ -+/* Define WORD_MACHINE if addresses and such have -+ * to be corrected before they can be used as byte counts. */ -+ -+/* #define WORD_MACHINE */ -+ -+/* Now define a symbol for the cpu type, if your compiler -+ does not define it automatically: -+ Ones defined so far include vax, m68000, ns16000, pyramid, -+ orion, tahoe, APOLLO and many others */ -+/* __x86_64 defined automatically. */ -+ -+/* Use type int rather than a union, to represent Lisp_Object */ -+/* This is desirable for most machines. */ -+ -+#define NO_UNION_TYPE -+ -+/* Define the type to use. */ -+#define EMACS_INT long -+#define EMACS_UINT unsigned long -+#define SPECIAL_EMACS_INT -+ -+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend -+ the 24-bit bit field into an int. In other words, if bit fields -+ are always unsigned. -+ -+ If you use NO_UNION_TYPE, this flag does not matter. */ -+ -+#define EXPLICIT_SIGN_EXTEND -+ -+/* Data type of load average, as read out of kmem. */ -+ -+#define LOAD_AVE_TYPE long -+ -+/* Convert that into an integer that is 100 for a load average of 1.0 */ -+ -+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -+ -+/* Define CANNOT_DUMP on machines where unexec does not work. -+ Then the function dump-emacs will not be defined -+ and temacs will do (load "loadup") automatically unless told otherwise. */ -+ -+/* #define CANNOT_DUMP */ -+ -+/* Define VIRT_ADDR_VARIES if the virtual addresses of -+ pure and impure space as loaded can vary, and even their -+ relative order cannot be relied on. -+ -+ Otherwise Emacs assumes that text space precedes data space, -+ numerically. */ -+ -+/* #define VIRT_ADDR_VARIES */ -+ -+/* Define C_ALLOCA if this machine does not support a true alloca -+ and the one written in C should be used instead. -+ Define HAVE_ALLOCA to say that the system provides a properly -+ working alloca function and it should be used. -+ Define neither one if an assembler-language alloca -+ in the file alloca.s should be used. */ -+ -+#define C_ALLOCA -+#define HAVE_ALLOCA -+ -+/* Define NO_REMAP if memory segmentation makes it not work well -+ to change the boundary between the text section and data section -+ when Emacs is dumped. If you define this, the preloaded Lisp -+ code will not be sharable; but that's better than failing completely. */ -+ -+/* #define NO_REMAP */ -+ -+#define PNTR_COMPARISON_TYPE unsigned long -+ -+/* On the 64 bit architecture, we can use 60 bits for addresses */ -+ -+#define VALBITS 60 -+ -+/* This definition of MARKBIT is necessary because of the comparison of -+ ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */ -+ -+#define MARKBIT 0x8000000000000000L -+ -+/* Define XINT and XUINT so that they can take arguments of type int */ -+#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS)) -+#define XUINT(a) ((long) (a) & VALMASK) -+ -+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ -+ -+#define XPNTR(a) XUINT (a) -+ -+#undef START_FILES -+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o -+ -+#undef LIB_STANDARD -+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o ---- emacs-21.4/configure 2003-03-18 14:19:12.000000000 +0000 -+++ emacs-21.4-fixed/configure 2005-09-03 16:08:19.000000000 +0000 -@@ -1686,6 +1686,11 @@ - machine=f301 opsys=uxpv - ;; - -+ ## AMD x86-64 Linux-based GNU system -+ x86_64-*-linux-gnu* ) -+ machine=amdx86-64 opsys=gnu-linux -+ ;; -+ - * ) - unported=yes - ;;