diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-01-19 17:53:05 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-01-19 17:53:05 +0000 |
commit | 52c8bc30716e9742e0fc37d438ec58899e2aaf9f (patch) | |
tree | 724e2736771a9927a3a4c4ba2f4f623750527fbc | |
parent | Security fix for EDE, bug 398227. (diff) | |
download | emacs-patches-52c8bc30716e9742e0fc37d438ec58899e2aaf9f.tar.gz emacs-patches-52c8bc30716e9742e0fc37d438ec58899e2aaf9f.tar.bz2 emacs-patches-52c8bc30716e9742e0fc37d438ec58899e2aaf9f.zip |
Initial patchset for Emacs 23.4emacs-23.4-patches-1
-rw-r--r-- | emacs/23.4/02_all_gameuser.patch | 17 | ||||
-rw-r--r-- | emacs/23.4/04_all_ns-appdirs.patch | 50 |
2 files changed, 67 insertions, 0 deletions
diff --git a/emacs/23.4/02_all_gameuser.patch b/emacs/23.4/02_all_gameuser.patch new file mode 100644 index 0000000..8e061a0 --- /dev/null +++ b/emacs/23.4/02_all_gameuser.patch @@ -0,0 +1,17 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7717 + +--- emacs-23.2-orig/configure.in ++++ emacs-23.2/configure.in +@@ -175,6 +175,12 @@ + This option is only used on x86-64 and s390x GNU/Linux architectures.])]) + CRT_DIR="${with_crt_dir}" + ++AC_ARG_WITH(gameuser,dnl ++[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])]) ++test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \ ++ && gameuser="${with_gameuser}" ++test "X$gameuser" = X && gameuser=games ++ + AC_ARG_WITH([gnustep-conf],dnl + [AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])]) + test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \ diff --git a/emacs/23.4/04_all_ns-appdirs.patch b/emacs/23.4/04_all_ns-appdirs.patch new file mode 100644 index 0000000..07113ff --- /dev/null +++ b/emacs/23.4/04_all_ns-appdirs.patch @@ -0,0 +1,50 @@ +http://bugs.gentoo.org/268793 + +--- emacs-23.2-orig/configure.in ++++ emacs-23.2/configure.in +@@ -1417,10 +1417,10 @@ + window_system=nextstep + with_xft=no + # set up packaging dirs +- exec_prefix=${ns_appbindir} +- libexecdir=${ns_appbindir}/libexec + if test "${EN_NS_SELF_CONTAINED}" = yes; then + prefix=${ns_appresdir} ++ exec_prefix=${ns_appbindir} ++ libexecdir=${ns_appbindir}/libexec + fi + fi + CFLAGS="$tmp_CFLAGS" +--- emacs-23.2-orig/leim/Makefile.in ++++ emacs-23.2/leim/Makefile.in +@@ -263,11 +263,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} \ +--- emacs-23.2-orig/Makefile.in ++++ emacs-23.2/Makefile.in +@@ -424,16 +424,6 @@ + ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ + else true; fi ; \ + done +- if test "${ns_appdir}" != ""; 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}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ +- rm -fr emacs ) ; \ +- ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ +- ln -sf ../libexec/* .) ; \ +- else true ; fi + + ## 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. |