Browse Source

emacs22: added some patches

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2294 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
815156858b

BIN
e/emacs22/emacs-21.1-bzip2.patch.bz2


+ 11 - 0
e/emacs22/emacs-22.0.50-fixed-resolution.patch

@@ -0,0 +1,11 @@
+--- emacs-22.0.50.20050907/src/xterm.c.orig	2005-09-07 13:46:42.000000000 +0900
++++ emacs-22.0.50.20050907/src/xterm.c	2005-09-07 16:49:25.000000000 +0900
+@@ -10405,6 +10405,8 @@
+     /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
+     mm = DisplayWidthMM (dpyinfo->display, screen_number);
+     dpyinfo->resx = (mm < 1) ? 100 : pixels * 25.4 / mm;
++    dpyinfo->resy = 96;
++    dpyinfo->resx = 96;
+   }
+ 
+   dpyinfo->Xatom_wm_protocols

+ 40 - 0
e/emacs22/emacs-22.1-locallisppath.patch

@@ -0,0 +1,40 @@
+--- emacs-22.1/configure.in.orig	2007-05-25 21:43:29.000000000 +0900
++++ emacs-22.1/configure.in	2007-06-04 14:04:10.000000000 +0900
+@@ -32,7 +32,7 @@
+ AC_ARG_PROGRAM
+ 
+ lispdir='${datadir}/emacs/${version}/lisp'
+-locallisppath='${datadir}/emacs/${version}/site-lisp:'\
++locallisppath='${datadir}/emacs-${version}/site-lisp:'\
+ '${datadir}/emacs/site-lisp'
+ lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
+ etcdir='${datadir}/emacs/${version}/etc'
+--- emacs-22.1/Makefile.in.orig	2007-05-14 23:56:28.000000000 +0900
++++ emacs-22.1/Makefile.in	2007-06-04 14:06:19.000000000 +0900
+@@ -455,14 +455,14 @@
+ 	done
+ 	-rm -f $(DESTDIR)${lispdir}/subdirs.el
+ 	$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
+-	if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
++	if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \
+ 	then true; \
+ 	else \
+ 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+ 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
+-	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
++	    > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \
+ 	fi
+-	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
++	chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el
+ 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
+ 	then true; \
+ 	else \
+@@ -559,7 +559,7 @@
+ 	$(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
+ 	  $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
+ 	  $(DESTDIR)${datadir}/emacs/site-lisp \
+-	  $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
++	  $(DESTDIR)${datadir}/emacs-${version}/site-lisp \
+ 	  $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
+ 
+ ### Delete all the installed files that the `install' target would

+ 23 - 0
e/emacs22/emacs-22.3-gcc44.patch

@@ -0,0 +1,23 @@
+diff -up emacs-22.3/configure.in\~ emacs-22.3/configure.in
+--- emacs-22.3/configure.in~	2010-04-02 10:33:25.000000000 +0900
++++ emacs-22.3/configure.in	2010-04-02 11:19:48.000000000 +0900
+@@ -3388,7 +3388,7 @@ echo creating lib-src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
+@@ -3404,7 +3404,7 @@ echo creating src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
+
+Diff finished.  Fri Apr  2 11:19:52 2010