Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21363
Modified Files:
emacs22.info emacs22.patch
Log Message:
Fix a compilation error on 10.6 x86/64. See:
http://article.gmane.org/gmane.os.apple.fink.general/29234
Index: emacs22.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- emacs22.patch 7 Apr 2008 12:58:57 -0000 1.5
+++ emacs22.patch 9 Sep 2009 11:41:40 -0000 1.6
@@ -1,6 +1,6 @@
-diff -ruN --exclude '*~' emacs-22.2/Makefile.in emacs-22.2.patched/Makefile.in
---- emacs-22.2/Makefile.in 2008-01-10 13:15:24.000000000 +0100
-+++ emacs-22.2.patched/Makefile.in 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/Makefile.in emacs-22.3.patched/Makefile.in
+--- emacs-22.3/Makefile.in 2008-01-07 09:53:19.000000000 +0100
++++ emacs-22.3.patched/Makefile.in 2009-09-09 13:01:41.000000000 +0200
@@ -438,7 +438,7 @@
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
@@ -28,9 +28,9 @@
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
-diff -ruN --exclude '*~' emacs-22.2/configure emacs-22.2.patched/configure
---- emacs-22.2/configure 2008-03-01 20:28:11.000000000 +0100
-+++ emacs-22.2.patched/configure 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/configure emacs-22.3.patched/configure
+--- emacs-22.3/configure 2008-09-05 18:21:51.000000000 +0200
++++ emacs-22.3.patched/configure 2009-09-09 13:01:41.000000000 +0200
@@ -1807,7 +1807,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
@@ -52,9 +52,9 @@
fi
-diff -ruN --exclude '*~' emacs-22.2/fix-info emacs-22.2.patched/fix-info
---- emacs-22.2/fix-info 1970-01-01 01:00:00.000000000 +0100
-+++ emacs-22.2.patched/fix-info 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/fix-info emacs-22.3.patched/fix-info
+--- emacs-22.3/fix-info 1970-01-01 01:00:00.000000000 +0100
++++ emacs-22.3.patched/fix-info 2009-09-09 13:01:41.000000000 +0200
@@ -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 --exclude '*~' emacs-22.2/leim/Makefile.in
emacs-22.2.patched/leim/Makefile.in
---- emacs-22.2/leim/Makefile.in 2008-01-10 13:15:30.000000000 +0100
-+++ emacs-22.2.patched/leim/Makefile.in 2008-04-07 14:18:15.000000000
+0200
+diff -ruN --exclude='*~' emacs-22.3/leim/Makefile.in
emacs-22.3.patched/leim/Makefile.in
+--- emacs-22.3/leim/Makefile.in 2008-01-07 09:09:43.000000000 +0100
++++ emacs-22.3.patched/leim/Makefile.in 2009-09-09 13:01:41.000000000
+0200
@@ -253,7 +253,7 @@
done) \
else true; fi
@@ -81,9 +81,9 @@
clean mostlyclean:
rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
-diff -ruN --exclude '*~' emacs-22.2/lisp/startup.el
emacs-22.2.patched/lisp/startup.el
---- emacs-22.2/lisp/startup.el 2008-03-07 18:01:12.000000000 +0100
-+++ emacs-22.2.patched/lisp/startup.el 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/lisp/startup.el
emacs-22.3.patched/lisp/startup.el
+--- emacs-22.3/lisp/startup.el 2008-03-06 01:08:01.000000000 +0100
++++ emacs-22.3.patched/lisp/startup.el 2009-09-09 13:01:41.000000000 +0200
@@ -291,6 +291,10 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
@@ -118,9 +118,9 @@
;; Sites should not disable this. Only individuals should disable
;; the startup screen.
(setq inhibit-startup-screen nil)
-diff -ruN --exclude '*~' emacs-22.2/mangle-info emacs-22.2.patched/mangle-info
---- emacs-22.2/mangle-info 1970-01-01 01:00:00.000000000 +0100
-+++ emacs-22.2.patched/mangle-info 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/mangle-info emacs-22.3.patched/mangle-info
+--- emacs-22.3/mangle-info 1970-01-01 01:00:00.000000000 +0100
++++ emacs-22.3.patched/mangle-info 2009-09-09 13:01:41.000000000 +0200
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w -i
+
@@ -140,9 +140,9 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
-diff -ruN --exclude '*~' emacs-22.2/src/Makefile.in
emacs-22.2.patched/src/Makefile.in
---- emacs-22.2/src/Makefile.in 2008-01-10 13:16:14.000000000 +0100
-+++ emacs-22.2.patched/src/Makefile.in 2008-04-07 14:16:57.000000000 +0200
+diff -ruN --exclude='*~' emacs-22.3/src/Makefile.in
emacs-22.3.patched/src/Makefile.in
+--- emacs-22.3/src/Makefile.in 2008-07-11 10:52:53.000000000 +0200
++++ emacs-22.3.patched/src/Makefile.in 2009-09-09 13:01:41.000000000 +0200
@@ -441,7 +441,7 @@
#if HAVE_GIF
@@ -152,3 +152,92 @@
#endif /* not defined LIBGIF */
#else /* not HAVE_GIF */
#define LIBGIF
+diff -ruN --exclude='*~' emacs-22.3/src/s/darwin.h
emacs-22.3.patched/src/s/darwin.h
+--- emacs-22.3/src/s/darwin.h 2008-07-23 18:40:47.000000000 +0200
++++ emacs-22.3.patched/src/s/darwin.h 2009-09-09 13:20:52.000000000 +0200
+@@ -351,6 +351,9 @@
+ #define malloc unexec_malloc
+ #define realloc unexec_realloc
+ #define free unexec_free
++/* Don't use posix_memalign because it is not compatible with
++ unexmacosx.c. */
++#undef HAVE_POSIX_MEMALIGN
+ #endif
+
+ /* This makes create_process in process.c save and restore signal
+diff -ruN --exclude='*~' emacs-22.3/src/unexmacosx.c
emacs-22.3.patched/src/unexmacosx.c
+--- emacs-22.3/src/unexmacosx.c 2008-01-08 05:29:48.000000000 +0100
++++ emacs-22.3.patched/src/unexmacosx.c 2009-09-09 13:24:03.000000000
+0200
+@@ -584,6 +584,14 @@
+ printf ("LC_UUID ");
+ break;
+ #endif
++#ifdef LC_DYLD_INFO
++ case LC_DYLD_INFO:
++ printf ("LC_DYLD_INFO ");
++ break;
++ case LC_DYLD_INFO_ONLY:
++ printf ("LC_DYLD_INFO_ONLY");
++ break;
++#endif
+ default:
+ printf ("unknown ");
+ }
+@@ -821,6 +829,7 @@
+ || strncmp (sectp->sectname, "__const", 16) == 0
+ || strncmp (sectp->sectname, "__cfstring", 16) == 0
+ || strncmp (sectp->sectname, "__gcc_except_tab", 16) == 0
++ || strncmp (sectp->sectname, "__program_vars", 16) == 0
+ || strncmp (sectp->sectname, "__objc_", 7) == 0)
+ {
+ if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))
+@@ -1088,6 +1097,36 @@
+ curr_header_offset += lc->cmdsize;
+ }
+
++#ifdef LC_DYLD_INFO
++/* Copy a LC_DYLD_INFO(_ONLY) load command from the input file to the output
++ file, adjusting the file offset fields. */
++static void
++copy_dyld_info (struct load_command *lc, long delta)
++{
++ struct dyld_info_command *dip = (struct dyld_info_command *) lc;
++
++ if (dip->rebase_off > 0)
++ dip->rebase_off += delta;
++ if (dip->bind_off > 0)
++ dip->bind_off += delta;
++ if (dip->weak_bind_off > 0)
++ dip->weak_bind_off += delta;
++ if (dip->lazy_bind_off > 0)
++ dip->lazy_bind_off += delta;
++ if (dip->export_off > 0)
++ dip->export_off += delta;
++
++ printf ("Writing ");
++ print_load_command_name (lc->cmd);
++ printf (" command\n");
++
++ if (!unexec_write (curr_header_offset, lc, lc->cmdsize))
++ unexec_error ("cannot write dyld info command to header");
++
++ curr_header_offset += lc->cmdsize;
++}
++#endif
++
+ /* Copy other kinds of load commands from the input file to the output
+ file, ones that do not require adjustments of file offsets. */
+ static void
+@@ -1154,6 +1193,12 @@
+ case LC_TWOLEVEL_HINTS:
+ copy_twolevelhints (lca[i], linkedit_delta);
+ break;
++#ifdef LC_DYLD_INFO
++ case LC_DYLD_INFO:
++ case LC_DYLD_INFO_ONLY:
++ copy_dyld_info (lca[i], linkedit_delta);
++ break;
++#endif
+ default:
+ copy_other (lca[i]);
+ break;
Index: emacs22.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- emacs22.info 16 Apr 2009 12:38:01 -0000 1.21
+++ emacs22.info 9 Sep 2009 11:41:40 -0000 1.22
@@ -1,7 +1,7 @@
Info2: <<
Package: emacs22%type_pkg[uitype]
Version: 22.3
-Revision: 1003
+Revision: 1004
Type: uitype (. -nox -gtk)
Description: Flexible real-time text editor
License: GPL
@@ -59,7 +59,7 @@
Source: mirror:gnu:emacs/emacs-%v.tar.gz
Source-MD5: aa8ba34f548cd78b35914ae5a7bb87eb
PatchFile: emacs22.patch
-PatchFile-MD5: 2cba7e979ec85b267b25a386c72962c9
+PatchFile-MD5: b42198060737216e3ed802ec2e7ad386
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
