Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2656/10.4/stable/main/finkinfo/editors
Modified Files:
emacs22-carbon.info emacs22-carbon.patch
Log Message:
Sync with unstable. This should wolk on 10.6.
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- emacs22-carbon.info 26 Aug 2009 07:14:21 -0000 1.5
+++ emacs22-carbon.info 7 Dec 2009 22:44:02 -0000 1.6
@@ -1,12 +1,11 @@
Package: emacs22-carbon
-Version: 22.2
-Revision: 1001
-Distribution: 10.4, 10.5
+Version: 22.3
+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
Source: mirror:gnu:emacs/emacs-%v.tar.gz
-Source-MD5: d6ee586b8752351334ebf072904c4d51
+Source-MD5: aa8ba34f548cd78b35914ae5a7bb87eb
Source2:
http://downloads.sourceforge.jp/macemacsjp/30446/inline_patch-1.0.4.tar.gz
Source2-MD5: 63c14c4edb754e472dfd806435ecace1
Source3:
http://downloads.sourceforge.jp/macemacsjp/30185/transparency-3.1.2.tar.gz
@@ -22,6 +21,12 @@
Source7: http://downloads.sourceforge.jp/macemacsjp/24135/hide_menubar.tar.gz
Source7Rename: hide_menubar-0.2.0.tar.gz
Source7-MD5: df47c265c220ed6ea4aaf4f5887772fb
+# Obtained from
http://svn.sourceforge.jp/view/*checkout*/inline_patch/trunk/emacs-inline.patch?rev=554&root=macemacsjp
+Source8:
http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/emacs-inline-20080629.patch
+Source8-MD5: dfd877f23d7159db875105318ed9f788
+# Obtained from
http://svn.sourceforge.jp/view/*checkout*/zenitani/CarbonEmacs/src/patch/transparency4.patch?content-type=text%2Fplain&root=macwiki
+Source9:
http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/transparency4-20081120.patch
+Source9-MD5: 2b66f28b8e5c17da4706da279f7e8138
Description: Flexible real-time text editor, Aqua native
DocFiles: <<
AUTHORS COPYING README mac/README:mac.README
@@ -33,10 +38,12 @@
AppBundles: finktmp/mac/Emacs22.app
PatchFile: %n.patch
-PatchFile-MD5: 32716b958e65061c91f5c6d5477e4538
+PatchFile-MD5: 1bf0fc51c16f88401134f8f109b0221f
PatchScript: <<
#!/bin/sh -ev
+sed -i.bak -e 's|P_ ((scroll_bar|P_ ((struct scroll_bar|' src/macterm.h
+
# Remove CVS date from version number (%v) and append '-carbon' suffix
v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
@@ -44,8 +51,11 @@
-e 's|@EMACS-FLAVOR@|%n|g' \
-e "s|@EMACS-VERSION@|$v|g" \
%{PatchFile} | patch -p1
-/usr/bin/patch -p0 -i ../inline_patch-*/emacs-inline.patch
-/usr/bin/patch -p0 -i ../transparency*/transparency*.patch
+#/usr/bin/patch -p0 -i ../inline_patch-*/emacs-inline.patch
+/usr/bin/patch -p0 -i ../emacs-inline*.patch
+#/usr/bin/patch -p0 -i ../transparency*/transparency*.patch
+/usr/bin/patch -p0 -i ../transparency*.patch
+
mkdir finktmp
cp ../fixed-width-fontset.*/carbon-font.el
../fixed-width-fontset.*/fixed-width-fontset.el finktmp
/usr/bin/patch -p0 -i ../mac-functions-*.patch
Index: emacs22-carbon.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs22-carbon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs22-carbon.patch 1 Jan 2009 14:40:57 -0000 1.2
+++ emacs22-carbon.patch 7 Dec 2009 22:44:02 -0000 1.3
@@ -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;
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
