diff options
author | 2007-11-27 23:42:01 +0000 | |
---|---|---|
committer | 2007-11-27 23:42:01 +0000 | |
commit | ceb4aba6edcec0c28ff40e47f87215807adaf32a (patch) | |
tree | 38550de1491a04a3a5551b8f986bf9680c63cc9a /app-editors | |
parent | Emit warning message in elisp-site-regen. (diff) | |
download | emacs-ceb4aba6edcec0c28ff40e47f87215807adaf32a.tar.gz emacs-ceb4aba6edcec0c28ff40e47f87215807adaf32a.tar.bz2 emacs-ceb4aba6edcec0c28ff40e47f87215807adaf32a.zip |
Sync with Portage.
svn path=/emacs-overlay/; revision=800
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 5 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.1-r3.ebuild (renamed from app-editors/emacs/emacs-22.1-r2.ebuild) | 1 | ||||
-rw-r--r-- | app-editors/emacs/files/emacs-22.1-format-int.patch | 79 |
4 files changed, 88 insertions, 2 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index d00103b..73c4bdc 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Nov 2007; Ulrich Mueller <ulm@gentoo.org> + +files/emacs-22.1-format-int.patch, -emacs-22.1-r2.ebuild, + +emacs-22.1-r3.ebuild: + Sync with Portage. + 22 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r2.ebuild: Fix alsa dependency, thanks Flameeyes for pointing this out. diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 9c976a8..c810a0b 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,11 +1,12 @@ AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 SHA1 0302df9678f2cc59c89da8bf47130810e08bfbbf SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc +AUX emacs-22.1-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b AUX emacs-22.1-hack-local-variables.patch 561 RMD160 248f09898369161dcd0e3148c7fcb4c9de5b3bc5 SHA1 02018dc2b66f829c83aeeadca240e282a695b9a1 SHA256 d3e2ec4d4b2788a5a6d91669bfc9dcb3dc7ff1f80195d42e5ae751fa4e26b9fb AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590 AUX emacs-22.1-xembed.patch 12136 RMD160 96bf6095e8b6af78f7a5289820bde3a7043e74d8 SHA1 570faf7fa854624ea8f00df38a59c9b83f673f00 SHA256 ba41d8bf8830c657565c9ecc506d662f0eb45043e5aa2ea374031ba3185011f7 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 -EBUILD emacs-22.1-r2.ebuild 7744 RMD160 97125f18a8d2808af71278589906db4c0b9ed139 SHA1 b38d909a31838aa4c9952b36fe8b9ba0eb75615d SHA256 ebd1a674289476a619bab861964ee633a00617c78b35d739ca1c30c9ebe3e87d -MISC ChangeLog 1297 RMD160 4eb530616f81553d642e44723023ec67baa0d23e SHA1 d28c1bc2bcc186bd34731fe16745af7ae1bda71a SHA256 e53973f7828e0944789112cd95052a592008bf2994daafaeec8c7754516dfb4e +EBUILD emacs-22.1-r3.ebuild 7788 RMD160 89a5d651c8b4de8e7841eda1e356ea7e45a35566 SHA1 d64f243e0cf52e00ad321ddb3ee6616a15937035 SHA256 bae9a9b39acb7e66f409471a3a5f7fc4aa70eed65ca47d5d76867e833a1b19fb +MISC ChangeLog 1452 RMD160 c0578af6f4b1024e41b3c0ab6789316434411c02 SHA1 159c9304095e302fe3162bba2f596435e0e513eb SHA256 ff4e28116f7a17c20fbe75fdf79a2f4fb3c9833aed72aacebd4e075c61156c45 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab diff --git a/app-editors/emacs/emacs-22.1-r2.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild index a82f16f..4ec6504 100644 --- a/app-editors/emacs/emacs-22.1-r2.ebuild +++ b/app-editors/emacs/emacs-22.1-r3.ebuild @@ -70,6 +70,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-oldxmenu-qa.patch" epatch "${FILESDIR}/${P}-backup-buffer.patch" epatch "${FILESDIR}/${P}-hack-local-variables.patch" + epatch "${FILESDIR}/${P}-format-int.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch" diff --git a/app-editors/emacs/files/emacs-22.1-format-int.patch b/app-editors/emacs/files/emacs-22.1-format-int.patch new file mode 100644 index 0000000..851bcb9 --- /dev/null +++ b/app-editors/emacs/files/emacs-22.1-format-int.patch @@ -0,0 +1,79 @@ +2007-11-15 Andreas Schwab <schwab@suse.de> + + * editfns.c (Fformat): Correctly format EMACS_INT values. Also + take precision into account when formatting an integer. + +--- src/editfns.c 8 Aug 2007 07:49:19 -0000 1.439.2.3 ++++ src/editfns.c 16 Nov 2007 00:18:55 -0000 1.439.2.8 +@@ -3543,8 +3543,10 @@ usage: (format STRING &rest OBJECTS) */ + precision[n+1] = 10 * precision[n+1] + *format - '0'; + } + +- if (format - this_format_start + 1 > longest_format) +- longest_format = format - this_format_start + 1; ++ /* Extra +1 for 'l' that we may need to insert into the ++ format. */ ++ if (format - this_format_start + 2 > longest_format) ++ longest_format = format - this_format_start + 2; + + if (format == end) + error ("Format string ends in middle of format specifier"); +@@ -3605,7 +3607,7 @@ usage: (format STRING &rest OBJECTS) */ + && *format != 'i' && *format != 'X' && *format != 'c') + error ("Invalid format operation %%%c", *format); + +- thissize = 30; ++ thissize = 30 + (precision[n] > 0 ? precision[n] : 0); + if (*format == 'c') + { + if (! SINGLE_BYTE_CHAR_P (XINT (args[n])) +@@ -3803,23 +3805,35 @@ usage: (format STRING &rest OBJECTS) */ + format - this_format_start); + this_format[format - this_format_start] = 0; + +- if (INTEGERP (args[n])) ++ if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') ++ sprintf (p, this_format, XFLOAT_DATA (args[n])); ++ else + { +- if (format[-1] == 'd') +- sprintf (p, this_format, XINT (args[n])); +- /* Don't sign-extend for octal or hex printing. */ ++ if (sizeof (EMACS_INT) > sizeof (int)) ++ { ++ /* Insert 'l' before format spec. */ ++ this_format[format - this_format_start] ++ = this_format[format - this_format_start - 1]; ++ this_format[format - this_format_start - 1] = 'l'; ++ this_format[format - this_format_start + 1] = 0; ++ } ++ ++ if (INTEGERP (args[n])) ++ { ++ if (format[-1] == 'd') ++ sprintf (p, this_format, XINT (args[n])); ++ /* Don't sign-extend for octal or hex printing. */ ++ else ++ sprintf (p, this_format, XUINT (args[n])); ++ } ++ else if (format[-1] == 'd') ++ /* Maybe we should use "%1.0f" instead so it also works ++ for values larger than MAXINT. */ ++ sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); + else +- sprintf (p, this_format, XUINT (args[n])); ++ /* Don't sign-extend for octal or hex printing. */ ++ sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); + } +- else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') +- sprintf (p, this_format, XFLOAT_DATA (args[n])); +- else if (format[-1] == 'd') +- /* Maybe we should use "%1.0f" instead so it also works +- for values larger than MAXINT. */ +- sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); +- else +- /* Don't sign-extend for octal or hex printing. */ +- sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); + + if (p > buf + && multibyte |