Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25259
Modified Files:
emacs22-carbon.info emacs22-carbon.patch
Log Message:
Fix a compilation error on 10.6 x86/64; imported from emacs22.patch.
This bug was reported by Takahiro Sato. Thanks.
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- emacs22-carbon.info 29 Jan 2009 06:52:38 -0000 1.15
+++ emacs22-carbon.info 6 Dec 2009 05:15:22 -0000 1.16
@@ -1,6 +1,6 @@
Package: emacs22-carbon
Version: 22.3
-Revision: 1
+Revision: 2
BuildDepends: libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12)
Depends: emacsen-common, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs
(>= 5.4-20041023-1006), passwd, macosx
Provides: emacsen
@@ -38,7 +38,7 @@
AppBundles: finktmp/mac/Emacs22.app
PatchFile: %n.patch
-PatchFile-MD5: 32716b958e65061c91f5c6d5477e4538
+PatchFile-MD5: 1bf0fc51c16f88401134f8f109b0221f
PatchScript: <<
#!/bin/sh -ev
Index: emacs22-carbon.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22-carbon.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- emacs22-carbon.patch 12 Apr 2008 05:41:29 -0000 1.5
+++ emacs22-carbon.patch 6 Dec 2009 05:15:22 -0000 1.6
@@ -156,3 +156,92 @@
+print ${PREMATCH};
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+diff -Naur emacs-22.3.orig/src/s/darwin.h emacs-22.3/src/s/darwin.h
+--- emacs-22.3.orig/src/s/darwin.h 2008-07-23 18:40:47.000000000 +0200
++++ emacs-22.3/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 -Naur emacs-22.3.orig/src/unexmacosx.c emacs-22.3/src/unexmacosx.c
+--- emacs-22.3.orig/src/unexmacosx.c 2008-01-08 05:29:48.000000000 +0100
++++ emacs-22.3/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;
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
