Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12588
Modified Files:
emacs22.patch emacs22.info
Log Message:
Patch src/uexmacosx.c to compile on Leopard. See:
http://article.gmane.org/gmane.emacs.bugs/16867
Index: emacs22.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- emacs22.patch 12 Feb 2007 01:02:11 -0000 1.3
+++ emacs22.patch 15 Nov 2007 03:37:31 -0000 1.4
@@ -1,7 +1,7 @@
-diff -ruN -x '*~' emacs-22.0.93/Makefile.in emacs-22.0.93.patched/Makefile.in
---- emacs-22.0.93/Makefile.in 2007-01-21 13:34:14.000000000 -0500
-+++ emacs-22.0.93.patched/Makefile.in 2007-01-24 12:03:45.000000000 -0500
-@@ -432,7 +432,7 @@
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/Makefile.in
emacs-22.1.patched/Makefile.in
+--- emacs-22.1/Makefile.in 2007-05-14 10:56:28.000000000 -0400
++++ emacs-22.1.patched/Makefile.in 2007-11-14 21:42:38.000000000 -0500
+@@ -437,7 +437,7 @@
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
@@ -10,7 +10,7 @@
for subdir in `find $${dest} -type d ! -name RCS ! -name CVS
-print` ; do \
chmod a+rx $${subdir} ; \
rm -rf $${subdir}/RCS ; \
-@@ -472,7 +472,7 @@
+@@ -477,7 +477,7 @@
echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
(cd ./etc; tar -chf - DOC*) \
|(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat >
/dev/null) || exit 1; \
@@ -19,7 +19,7 @@
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
-@@ -484,7 +484,7 @@
+@@ -489,7 +489,7 @@
echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..."
; \
(cd lisp; tar -chf - *.el *.elc) \
|(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat >
/dev/null) || exit 1; \
@@ -28,10 +28,10 @@
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
-diff -ruN -x '*~' emacs-22.0.93/configure emacs-22.0.93.patched/configure
---- emacs-22.0.93/configure 2007-01-22 19:37:53.000000000 -0500
-+++ emacs-22.0.93.patched/configure 2007-01-24 12:03:45.000000000 -0500
-@@ -1806,7 +1806,7 @@
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/configure
emacs-22.1.patched/configure
+--- emacs-22.1/configure 2007-05-25 08:43:29.000000000 -0400
++++ emacs-22.1.patched/configure 2007-11-14 21:42:38.000000000 -0500
+@@ -1807,7 +1807,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
@@ -40,7 +40,7 @@
gameuser=games
-@@ -13567,9 +13567,9 @@
+@@ -13917,9 +13917,9 @@
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
@@ -52,9 +52,9 @@
fi
-diff -ruN -x '*~' emacs-22.0.93/fix-info emacs-22.0.93.patched/fix-info
---- emacs-22.0.93/fix-info 1969-12-31 19:00:00.000000000 -0500
-+++ emacs-22.0.93.patched/fix-info 2007-01-24 12:03:45.000000000 -0500
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/fix-info
emacs-22.1.patched/fix-info
+--- emacs-22.1/fix-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-22.1.patched/fix-info 2007-11-14 21:42:38.000000000 -0500
@@ -0,0 +1,12 @@
+#!/bin/sh
+
@@ -69,9 +69,9 @@
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ No newline at end of file
-diff -ruN -x '*~' emacs-22.0.93/lisp/startup.el
emacs-22.0.93.patched/lisp/startup.el
---- emacs-22.0.93/lisp/startup.el 2007-01-21 13:34:20.000000000 -0500
-+++ emacs-22.0.93.patched/lisp/startup.el 2007-01-24 12:03:45.000000000
-0500
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/lisp/startup.el
emacs-22.1.patched/lisp/startup.el
+--- emacs-22.1/lisp/startup.el 2007-05-14 10:56:29.000000000 -0400
++++ emacs-22.1.patched/lisp/startup.el 2007-11-14 21:42:38.000000000 -0500
@@ -288,6 +288,10 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
@@ -83,7 +83,7 @@
(defvar no-blinking-cursor nil)
(defvar default-frame-background-mode)
-@@ -809,9 +813,19 @@
+@@ -815,9 +819,19 @@
;; Run the site-start library if it exists. The point of this file is
;; that it is run before .emacs. There is no point in doing this after
;; .emacs; that is useless.
@@ -106,9 +106,9 @@
;; Sites should not disable this. Only individuals should disable
;; the startup message.
(setq inhibit-startup-message nil)
-diff -ruN -x '*~' emacs-22.0.93/mangle-info emacs-22.0.93.patched/mangle-info
---- emacs-22.0.93/mangle-info 1969-12-31 19:00:00.000000000 -0500
-+++ emacs-22.0.93.patched/mangle-info 2007-01-24 12:03:45.000000000 -0500
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/mangle-info
emacs-22.1.patched/mangle-info
+--- emacs-22.1/mangle-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-22.1.patched/mangle-info 2007-11-14 21:42:38.000000000 -0500
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w -i
+
@@ -128,10 +128,10 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
-diff -ruN -x '*~' emacs-22.0.93/src/Makefile.in
emacs-22.0.93.patched/src/Makefile.in
---- emacs-22.0.93/src/Makefile.in 2007-01-21 13:34:41.000000000 -0500
-+++ emacs-22.0.93.patched/src/Makefile.in 2007-01-24 12:03:45.000000000
-0500
-@@ -436,7 +436,7 @@
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/src/Makefile.in
emacs-22.1.patched/src/Makefile.in
+--- emacs-22.1/src/Makefile.in 2007-03-21 10:31:24.000000000 -0400
++++ emacs-22.1.patched/src/Makefile.in 2007-11-14 21:42:38.000000000 -0500
+@@ -440,7 +440,7 @@
#if HAVE_GIF
#ifndef LIBGIF
@@ -140,3 +140,78 @@
#endif /* not defined LIBGIF */
#else /* not HAVE_GIF */
#define LIBGIF
+diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/src/unexmacosx.c
emacs-22.1.patched/src/unexmacosx.c
+--- emacs-22.1/src/unexmacosx.c 2007-01-20 23:18:15.000000000 -0500
++++ emacs-22.1.patched/src/unexmacosx.c 2007-11-14 21:44:17.000000000
-0500
+@@ -443,15 +443,13 @@
+
+ while (num && num_unexec_regions < MAX_UNEXEC_REGIONS)
+ {
+- /* Subtract the size of trailing null pages from filesize. It
++ /* Subtract the size of trailing null bytes from filesize. It
+ can be smaller than vmsize in segment commands. In such a
+- case, trailing pages are initialized with zeros. */
+- for (p = ranges->address + ranges->size; p > ranges->address;
+- p -= sizeof (int))
+- if (*(((int *) p)-1))
+- break;
+- filesize = ROUNDUP_TO_PAGE_BOUNDARY (p - ranges->address);
+- assert (filesize <= ranges->size);
++ case, trailing bytes are initialized with zeros. */
++ for (p = ranges->address + ranges->size; p > ranges->address; p--)
++ if (*(((char *) p)-1))
++ break;
++ filesize = p - ranges->address;
+
+ unexec_regions[num_unexec_regions].filesize = filesize;
+ unexec_regions[num_unexec_regions++].range = *ranges;
+@@ -503,11 +501,19 @@
+ {
+ int i, n;
+ unexec_region_info r;
++ vm_size_t padsize;
+
+ qsort (unexec_regions, num_unexec_regions, sizeof (unexec_regions[0]),
+ &unexec_regions_sort_compare);
+ n = 0;
+ r = unexec_regions[0];
++ padsize = r.range.address & (pagesize - 1);
++ if (padsize)
++ {
++ r.range.address -= padsize;
++ r.range.size += padsize;
++ r.filesize += padsize;
++ }
+ for (i = 1; i < num_unexec_regions; i++)
+ {
+ if (r.range.address + r.range.size == unexec_regions[i].range.address
+@@ -520,6 +526,17 @@
+ {
+ unexec_regions[n++] = r;
+ r = unexec_regions[i];
++ padsize = r.range.address & (pagesize - 1);
++ if (padsize)
++ {
++ if ((unexec_regions[n-1].range.address
++ + unexec_regions[n-1].range.size) == r.range.address)
++ unexec_regions[n-1].range.size -= padsize;
++
++ r.range.address -= padsize;
++ r.range.size += padsize;
++ r.filesize += padsize;
++ }
+ }
+ }
+ unexec_regions[n++] = r;
+@@ -562,6 +579,11 @@
+ case LC_TWOLEVEL_HINTS:
+ printf ("LC_TWOLEVEL_HINTS");
+ break;
++#ifdef LC_UUID
++ case LC_UUID:
++ printf ("LC_UUID ");
++ break;
++#endif
+ default:
+ printf ("unknown ");
+ }
Index: emacs22.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- emacs22.info 14 Oct 2007 21:13:22 -0000 1.10
+++ emacs22.info 15 Nov 2007 03:37:31 -0000 1.11
@@ -1,8 +1,7 @@
Info2: <<
Package: emacs22%type_pkg[uitype]
Version: 22.1
-Revision: 1002
-Distribution: 10.4
+Revision: 1003
Type: uitype (. -nox -gtk)
Description: Flexible real-time text editor
License: GPL
@@ -184,8 +183,10 @@
<<
ConfFiles: %p/var/games/emacs22/tetris-scores %p/var/games/emacs22/snake-scores
DescPort: <<
- The patchfile modifies startup.el, and brings in the scripts fix-info and
- mangle-info, in order to implement our emacs packaging system.
+ The patchfile modifies startup.el, and brings in the scripts fix-info
+ and mangle-info, in order to implement our emacs packaging system. It
+ also modifies src/unexmacosx.c to compile on Leopard. See:
+ http://article.gmane.org/gmane.emacs.bugs/16867
<<
Homepage: http://www.gnu.org/software/emacs/
<<
\ No newline at end of file
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
