Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3787/10.3/unstable/main/finkinfo/editors
Modified Files:
emacs22-carbon.info emacs22-carbon.patch
Log Message:
(1) Update macemacsjp patches.
(2) Import a patch for Leopard from emacs22.patch. Now it works on Leopard.
(3) Add handlings for the QuickTime version's issue on 10.3.
(4) Add a description of (mac-translate-from-yen-to-backslash) in DescUsage.
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- emacs22-carbon.info 18 Jun 2007 13:10:03 -0000 1.8
+++ emacs22-carbon.info 3 Dec 2007 13:11:33 -0000 1.9
@@ -1,18 +1,18 @@
Package: emacs22-carbon
Version: 22.1
# I committed 1001 in 10.3 and 1 in 10.4 by mistake; add 2000 to Revision.
-Revision: 2001
+Revision: 2002
BuildDepends: libncurses5, fink (>= 0.24.2)
Depends: emacsen-common, ncurses, libncurses5-shlibs, passwd, macosx
Provides: emacsen
Source: mirror:gnu:emacs/emacs-%v.tar.gz
Source-MD5: 6949df37caec2d7a2e0eee3f1b422726
-Source2:
http://downloads.sourceforge.jp/macemacsjp/25700/inline_patch-1.0.0.tar.gz
-Source2-MD5: ebc70f5a148d908b5b5435bad6b966f0
-Source3:
http://downloads.sourceforge.jp/macemacsjp/24136/transparency-3.0.0.tar.gz
-Source3-MD5: 32ec78ce70a85b3fb9cc409ab2a96fbb
-Source4:
http://downloads.sourceforge.jp/macemacsjp/25668/fixed-width-fontset.1.0.0.tar.gz
-Source4-MD5: ef2d0b570d408e256a11ca73a8877d64
+Source2:
http://downloads.sourceforge.jp/macemacsjp/26030/inline_patch-1.0.3.tar.gz
+Source2-MD5: cd29ca429a1d361de19320aace66c60d
+Source3:
http://downloads.sourceforge.jp/macemacsjp/26111/transparency-3.1.0.tar.gz
+Source3-MD5: e6eabf1735c0e8268ee2cadd33f7234a
+Source4:
http://downloads.sourceforge.jp/macemacsjp/26400/fixed-width-fontset.1.2.0.tar.gz
+Source4-MD5: f1235b505bd51bf306a10fe30f2a5cc8
Source5: http://downloads.sourceforge.jp/macemacsjp/17718/mac-functions.patch
Source5Rename: mac-functions-20051116.patch
Source5-MD5: 6d122157a8c1c98b2b569e07da545206
@@ -42,7 +42,7 @@
-e 's|@EMACS-FLAVOR@|%n|g' \
-e "s|@EMACS-VERSION@|$v|g" \
%a/%n.patch | patch -p1
-sed 's/:init-value t/:init-value nil/;s/mac_input_method_mode =
1/mac_input_method_mode = 0/' ../inline_patch-*/emacs-inline.patch | patch -p0
+/usr/bin/patch -p0 -i ../inline_patch-*/emacs-inline.patch
/usr/bin/patch -p0 -i ../transparency*/transparency*.patch
mkdir finktmp
cp ../fixed-width-fontset.*/carbon-font.el
../fixed-width-fontset.*/fixed-width-fontset.el finktmp
@@ -64,12 +64,25 @@
set +v
case `uname -r` in
7.*)
- if fgrep -q '7.0.4'
/System/Library/Frameworks/QuickTime.framework/Resources/version.plist; then
+ QTver="`/usr/lib/plistread
/System/Library/Frameworks/QuickTime.framework/Resources/version.plist
CFBundleShortVersionString`"
+ case ${QTver} in
+ 7.0.4)
+ echo "**************** ERROR ****************" >&2
echo 'QuickTime 7.0.4 breaks the build on 10.3.' >&2
echo 'Get 7.0.1 reinstaller and downgrade QuickTime.' >&2
echo
'http://www.apple.com/support/downloads/quicktime701reinstallerforquicktime704.html'
>&2
+ echo "**************** ERROR ****************" >&2
exit 1
- fi;;
+ ;;
+ 7.2* | 7.3*)
+ echo "**************** ERROR ****************" >&2
+ echo "QuickTime ${QTver} breaks the build on 10.3." >&2
+ echo "Get 7.1.6 installer and downgrade QuickTime." >&2
+ echo "**************** ERROR ****************" >&2
+ exit 1
+ ;;
+ esac
+ ;;
esac
set -v
./configure %c
@@ -253,8 +266,10 @@
If you want to input characters via MacIM in inline style, add your .emacs.el:
(if (eq window-system 'mac)
(mac-input-method-mode t))
-There are some problems around "inline patch"; Japanese people may prefer
-emacs22-carbon-22.0.50.cvs20060316.
+In addition, if you want to input "Backslash" instead of "Yen Sign", add:
+(if (eq window-system 'mac) (progn
+ (mac-input-method-mode t)
+ (mac-translate-from-yen-to-backslash)))
<<
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Index: emacs22-carbon.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/emacs22-carbon.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- emacs22-carbon.patch 8 Jun 2007 17:43:28 -0000 1.3
+++ emacs22-carbon.patch 3 Dec 2007 13:11:33 -0000 1.4
@@ -156,3 +156,78 @@
+print ${PREMATCH};
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+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 ");
+ }
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
