aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-05-16 09:12:07 +0200
committerUlrich Müller <ulm@gentoo.org>2014-05-16 09:12:07 +0200
commiteab4135e8e489e6b2877601aa91a63efd31cd930 (patch)
tree9ace47a4a86b22b10c96b348d98e981dcd0c4a7c
parentBackport xz support to Emacs 23.4. (diff)
downloademacs-patches-eab4135e8e489e6b2877601aa91a63efd31cd930.tar.gz
emacs-patches-eab4135e8e489e6b2877601aa91a63efd31cd930.tar.bz2
emacs-patches-eab4135e8e489e6b2877601aa91a63efd31cd930.zip
Remove 24.2 patchset.
-rw-r--r--emacs/24.2/01_all_ns-appdirs.patch41
-rw-r--r--emacs/24.2/02_all_paxctl.patch66
-rw-r--r--emacs/24.2/03_all_x32.patch21
-rw-r--r--emacs/24.2/05_all_freebsd.patch16
-rw-r--r--emacs/24.2/07_all_ar.patch47
-rw-r--r--emacs/24.2/08_all_ncurses-tinfo.patch35
6 files changed, 0 insertions, 226 deletions
diff --git a/emacs/24.2/01_all_ns-appdirs.patch b/emacs/24.2/01_all_ns-appdirs.patch
deleted file mode 100644
index a8e3f82..0000000
--- a/emacs/24.2/01_all_ns-appdirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/268793
-https://bugs.gentoo.org/399059
-
---- emacs-24.1-orig/Makefile.in
-+++ emacs-24.1/Makefile.in
-@@ -476,21 +476,6 @@
- -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
- rm -f $(DESTDIR)${bindir}/$(EMACS)
- -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
-- if test "${ns_appresdir}" != ""; then \
-- ( cd ${ns_appresdir} ; \
-- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
-- if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
-- rm -fr share ) ; \
-- ( cd ${ns_appbindir} ; \
-- if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
-- rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
-- ln -sf ../libexec/* . ; fi ; fi ) ; \
-- else true ; fi
--
--## FIXME is the emacs-24* bit above really necessary and correct?
--## What if I have 24.1 and 24.2 installed at the same time?
--## In any case, it should use something like echo $version | sed 's/\..*//'
--## instead of hard-coding a version.
-
- ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
- ## Needs to be the user running install, so configure can't set it.
---- emacs-24.1-orig/leim/Makefile.in
-+++ emacs-24.1/leim/Makefile.in
-@@ -259,11 +259,6 @@
- [ -n "$${installuser}" ] && break ; \
- done ; \
- find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
-- if [ "${ns_appresdir}" != "" ]; then \
-- ( cd ${ns_appresdir} ; \
-- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
-- rm -fr share ) ; \
-- else true ; fi
-
- clean mostlyclean:
- rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \
diff --git a/emacs/24.2/02_all_paxctl.patch b/emacs/24.2/02_all_paxctl.patch
deleted file mode 100644
index 1f659e6..0000000
--- a/emacs/24.2/02_all_paxctl.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-On grsecurity/PaX systems, unexec will fail due to a gap between
-the bss section and the heap. This can be prevented by disabling
-memory randomization in temacs with "paxctl -r".
-https://bugs.gentoo.org/411439
-https://bugs.gentoo.org/426394
-http://debbugs.gnu.org/11398
-
---- emacs-24.1-orig/configure.in
-+++ emacs-24.1/configure.in
-@@ -757,6 +757,16 @@
- dnl Don't use GZIP, which is used by gzip for additional parameters.
- AC_PATH_PROG(GZIP_PROG, gzip)
-
-+if test $opsys = gnu-linux; then
-+ AC_PATH_PROG(PAXCTL, paxctl,,
-+ [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
-+ if test "X$PAXCTL" != X; then
-+ AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+ [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes)
-+ else AC_MSG_RESULT(no); PAXCTL=""; fi])
-+ fi
-+fi
-
- ## Need makeinfo >= 4.6 (?) to build the manuals.
- AC_PATH_PROG(MAKEINFO, makeinfo, no)
---- emacs-24.1-orig/src/Makefile.in
-+++ emacs-24.1/src/Makefile.in
-@@ -116,6 +116,12 @@
- ## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason).
- TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
-
-+## If available, the full path to the paxctl program.
-+## On grsecurity/PaX systems, unexec will fail due to a gap between
-+## the bss section and the heap. This can be prevented by disabling
-+## memory randomization in temacs with "paxctl -r". See bug#11398.
-+PAXCTL = @PAXCTL@
-+
- ## Some systems define this to request special libraries.
- LIBS_SYSTEM=@LIBS_SYSTEM@
-
-@@ -406,6 +412,7 @@
- -f list-load-path-shadows || true; \
- else \
- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
-+ test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
- ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
- ./emacs -batch -f list-load-path-shadows || true; \
- fi
-@@ -453,6 +460,8 @@
- temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a
- $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \
- -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES)
-+ test "$(CANNOT_DUMP)" = "yes" || \
-+ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
-
- ## The following oldxmenu-related rules are only (possibly) used if
- ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them
-@@ -600,6 +609,7 @@
- ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
- else \
- $(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \
-+ test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
- mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
- fi
- @: Compile some files earlier to speed up further compilation.
diff --git a/emacs/24.2/03_all_x32.patch b/emacs/24.2/03_all_x32.patch
deleted file mode 100644
index c3d68a4..0000000
--- a/emacs/24.2/03_all_x32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix compilation with ABI=x32.
-https://bugs.gentoo.org/420257
-
---- emacs-24.1-orig/src/m/amdx86-64.h
-+++ emacs-24.1/src/m/amdx86-64.h
-@@ -17,6 +17,7 @@
- You should have received a copy of the GNU General Public License
- along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-+#ifndef __ILP32__ /* Don't define for x32 ABI. */
- #define BITS_PER_LONG 64
- #define BITS_PER_EMACS_INT 64
-
-@@ -30,6 +31,7 @@
- #define EMACS_INT long
- #define pI "l"
- #define EMACS_UINT unsigned long
-+#endif /* __ILP32__ */
-
- /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
- #undef DATA_SEG_BITS
diff --git a/emacs/24.2/05_all_freebsd.patch b/emacs/24.2/05_all_freebsd.patch
deleted file mode 100644
index 7444c33..0000000
--- a/emacs/24.2/05_all_freebsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix linking on FreeBSD.
-http://debbugs.gnu.org/12047
-
---- emacs-24.1-orig/configure.in
-+++ emacs-24.1/configure.in
-@@ -1009,8 +1009,8 @@
- START_FILES='pre-crt0.o'
- ;;
- freebsd )
-- LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
-- START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
-+ LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
-+ START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
- ;;
- gnu-linux | gnu-kfreebsd )
- LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
diff --git a/emacs/24.2/07_all_ar.patch b/emacs/24.2/07_all_ar.patch
deleted file mode 100644
index 179a9da..0000000
--- a/emacs/24.2/07_all_ar.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Get AR and ARFLAGS from configure.
-https://bugs.gentoo.org/436758
-http://debbugs.gnu.org/12549
-
---- emacs-24.2-orig/lwlib/Makefile.in
-+++ emacs-24.2/lwlib/Makefile.in
-@@ -37,7 +37,8 @@
- CPPFLAGS=@CPPFLAGS@
- RANLIB=@RANLIB@
-
--AR = ar cq
-+AR = @AR@
-+ARFLAGS = @ARFLAGS@
-
- LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
- MOTIF_OBJS = lwlib-Xm.o
-@@ -65,7 +66,7 @@
-
- liblw.a: $(OBJS)
- rm -f $@
-- $(AR) $@ $(OBJS)
-+ $(AR) $(ARFLAGS) $@ $(OBJS)
- $(RANLIB) $@
-
- ## Generated files in ../src, non-generated in $(srcdir)/../src.
---- emacs-24.2-orig/oldXMenu/Makefile.in
-+++ emacs-24.2/oldXMenu/Makefile.in
-@@ -57,8 +57,8 @@
- TAGS = etags
- RM = rm -f
- RANLIB = @RANLIB@
--# Solaris 2.1 ar doesn't accept the 'l' option.
--AR = ar cq
-+AR = @AR@
-+ARFLAGS = @ARFLAGS@
-
- OBJS = Activate.o \
- AddPane.o \
-@@ -98,7 +98,7 @@
-
- libXMenu11.a: $(OBJS) $(EXTRA)
- $(RM) $@
-- $(AR) $@ $(OBJS) $(EXTRA)
-+ $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
- $(RANLIB) $@
-
- Activate.o: Activate.c XMenuInt.h XMenu.h X10.h
diff --git a/emacs/24.2/08_all_ncurses-tinfo.patch b/emacs/24.2/08_all_ncurses-tinfo.patch
deleted file mode 100644
index e4a6117..0000000
--- a/emacs/24.2/08_all_ncurses-tinfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix build failure with separate tinfo library.
-Patch taken from upstream bzr (emacs-24 branch) and backported to 24.2.
-https://bugs.gentoo.org/459458
-http://debbugs.gnu.org/9741
-
---- emacs-24.2-orig/configure.in
-+++ emacs-24.2/configure.in
-@@ -2813,7 +2813,7 @@
- ])
- # Maybe curses should be tried earlier?
- # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
--for tputs_library in '' ncurses terminfo termcap curses; do
-+for tputs_library in '' tinfo ncurses terminfo termcap curses; do
- OLIBS=$LIBS
- if test -z "$tputs_library"; then
- LIBS_TERMCAP=
-@@ -2833,7 +2833,8 @@
- AC_MSG_RESULT([$msg])
- if test "X$msg" = Xno; then
- AC_MSG_ERROR([The required function `tputs' was not found in any library.
--These libraries were tried: libncurses, libterminfo, libtermcap, libcurses.
-+The following libraries were tried (in order):
-+ libtinfo, libncurses, libterminfo, libtermcap, libcurses
- Please try installing whichever of these libraries is most appropriate
- for your system, together with its header files.
- For example, a libncurses-dev(el) or similar package.])
-@@ -2865,7 +2866,7 @@
- ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
- if test "x$HAVE_LIBNCURSES" = "xyes"; then
- TERMINFO=yes
-- LIBS_TERMCAP="-lncurses"
-+ test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses"
- fi
- ;;
-