rpms/xemacs/F-12 xemacs-21.5.29-dired-550145.patch, NONE, 1.1 xemacs-21.5.29-arabic-547840.patch, 1.1, 1.2 xemacs-snapshot.sh, 1.1, 1.2 xemacs.spec, 1.59, 1.60
Jerry James
jjames at fedoraproject.org
Thu Jan 7 17:05:12 UTC 2010
- Previous message (by thread): rpms/xemacs/F-11 xemacs-21.5.29-dired-550145.patch, NONE, 1.1 xemacs-21.5.29-arabic-547840.patch, 1.1, 1.2 xemacs-snapshot.sh, 1.1, 1.2 xemacs.spec, 1.57, 1.58
- Next message (by thread): rpms/xemacs/devel xemacs-21.5.29-dired-550145.patch, NONE, 1.1 xemacs-21.5.29-arabic-547840.patch, 1.1, 1.2 xemacs-snapshot.sh, 1.1, 1.2 xemacs.spec, 1.59, 1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjames
Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5230/F-12
Modified Files:
xemacs-21.5.29-arabic-547840.patch xemacs-snapshot.sh
xemacs.spec
Added Files:
xemacs-21.5.29-dired-550145.patch
Log Message:
* Thu Jan 7 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-11
- New upstream patch for bz 547840.
- Add dired patch for large files (bz 550145).
- Replace "lzma" with "xz" for snapshots.
xemacs-21.5.29-dired-550145.patch:
ChangeLog | 5 +++++
dired.c | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
--- NEW FILE xemacs-21.5.29-dired-550145.patch ---
diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog
--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700
+++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:32:56.046643371 -0700
@@ -1,3 +1,8 @@
+2010-01-07 Henrique Martins <xemacs at martins.cc>
+
+ * dired.c (file_name_completion): If a file is too big to stat(),
+ ignore the error, since we don't use the size.
+
2010-01-07 Aidan Kehoe <kehoea at parhasard.net>
* mule-charset.c:
diff -dur xemacs-21.5.29.ORIG/src/dired.c xemacs-21.5.29/src/dired.c
--- xemacs-21.5.29.ORIG/src/dired.c 2009-05-18 08:51:08.000000000 -0600
+++ xemacs-21.5.29/src/dired.c 2010-01-07 09:34:05.666614699 -0700
@@ -371,8 +371,10 @@
|| 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length))
continue;
- if (file_name_completion_stat (directory, dp, &st) < 0)
- continue;
+ /* Ignore file-too-large conditions; the mode is still filled in. */
+ if (file_name_completion_stat (directory, dp, &st) < 0 &&
+ errno != EOVERFLOW)
+ continue;
directoryp = ((st.st_mode & S_IFMT) == S_IFDIR);
if (directoryp)
xemacs-21.5.29-arabic-547840.patch:
lisp/ChangeLog | 9 ++++
lisp/mule/arabic.el | 3 -
lisp/mule/iso-with-esc.el | 83 ----------------------------------------
lisp/mule/mule-category.el | 1
lisp/mule/mule-msw-init-late.el | 1
lisp/unicode.el | 3 -
src/ChangeLog | 8 +++
src/lisp.h | 1
src/mule-charset.c | 12 +++++
9 files changed, 34 insertions(+), 87 deletions(-)
Index: xemacs-21.5.29-arabic-547840.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs-21.5.29-arabic-547840.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.29-arabic-547840.patch 21 Dec 2009 23:27:03 -0000 1.1
+++ xemacs-21.5.29-arabic-547840.patch 7 Jan 2010 17:05:11 -0000 1.2
@@ -1,63 +1,35 @@
diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog
---- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700
-+++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700
-@@ -1,3 +1,13 @@
-+2009-12-21 Aidan Kehoe <kehoea at parhasard.net>
+--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2010-01-07 09:52:09.259674650 -0700
++++ xemacs-21.5.29/lisp/ChangeLog 2010-01-07 09:31:59.498550275 -0700
+@@ -1,3 +1,12 @@
++2010-01-07 Aidan Kehoe <kehoea at parhasard.net>
+
-+ * mule/arabic.el (arabic-iso8859-6):
-+ Move the creation of this character set to this (dumped) file,
-+ since it's needed for input on X11.
-+ * mule/iso-with-esc.el:
-+ Remove arabic-iso8859-6 and its Unicode map from this file.
-+ * unicode.el (load-unicode-tables):
-+ Load arabic-iso8859-6 on startup again.
++ * unicode.el (load-unicode-tables):
++ * mule/mule-msw-init-late.el:
++ * mule/mule-category.el (predefined-category-list):
++ * mule/arabic.el:
++ Move arabic-iso8859-6 back to C, it needs to be there, otherwise
++ X11 character input lookup fails.
+
2009-11-01 Stephen Turnbull <stephen at xemacs.org>
* faces.el (Face-frob-property):
diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el
---- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700
-@@ -28,8 +28,34 @@
+--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2010-01-07 09:52:09.260680256 -0700
++++ xemacs-21.5.29/lisp/mule/arabic.el 2010-01-07 09:31:59.499595394 -0700
+@@ -28,9 +28,6 @@
;;; Code:
-;; See iso-with-esc.el for commentary on the ISO standard Arabic character
-;; set.
-+;; ISO 8859-6 is such a useless character set that it seems a waste of
-+;; codespace to dump it. Let me count the ways:
-+;;
-+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
-+;; plenty of unallocated code points.
-+;;
-+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
-+;; they are necessary, even for the Arabs, for basic things like
-+;; dictionary entries, children's books, and occasional disambiguation.
-+;;
-+;; 3. The Arabs don't use it, they use Windows-1256, which also supports
-+;; Persian, at least, as well as the French characters necessary in
-+;; Lebanon and North Africa.
-+
-+;; But; it's necessary for input on X11.
-+
-+(make-charset
-+ 'arabic-iso8859-6
-+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
-+ '(dimension 1
-+ registry "ISO8859-6"
-+ chars 96
-+ columns 1
-+ direction r2l
-+ final ?G
-+ graphic 1
-+ short-name "RHP of ISO8859/6"
-+ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
-
+-
(make-8-bit-coding-system
'iso-8859-6
+ '((#x80 ?\u0080) ;; <control>
diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el
---- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700
+--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2010-01-07 09:52:09.260680256 -0700
++++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2010-01-07 09:31:59.522633894 -0700
@@ -120,89 +120,6 @@
safe-charsets (ascii greek-iso8859-7)
mnemonic "Grk"))
@@ -148,9 +120,31 @@ diff -dur xemacs-21.5.29.ORIG/lisp/mule/
;;;###autoload
(make-coding-system
'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is
+diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-category.el xemacs-21.5.29/lisp/mule/mule-category.el
+--- xemacs-21.5.29.ORIG/lisp/mule/mule-category.el 2010-01-07 09:52:09.261601694 -0700
++++ xemacs-21.5.29/lisp/mule/mule-category.el 2010-01-07 09:31:59.523637910 -0700
+@@ -244,6 +244,7 @@
+ (latin-iso8859-4 ?l)
+ (latin-iso8859-9 ?l)
+ (cyrillic-iso8859-5 ?y "Cyrillic character set")
++ (arabic-iso8859-6 ?b "Arabic character set")
+ (greek-iso8859-7 ?g "Greek character set")
+ (hebrew-iso8859-8 ?w "Hebrew character set")
+ (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set")
+diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el xemacs-21.5.29/lisp/mule/mule-msw-init-late.el
+--- xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el 2010-01-07 09:52:09.261601694 -0700
++++ xemacs-21.5.29/lisp/mule/mule-msw-init-late.el 2010-01-07 09:31:59.523637910 -0700
+@@ -37,6 +37,7 @@
+ (greek-iso8859-7 . "Greek")
+ (latin-iso8859-9 . "Turkish")
+ (hebrew-iso8859-8 . "Hebrew")
++ (arabic-iso8859-6 . "Arabic")
+ (latin-iso8859-4 . "Baltic")
+ (vietnamese-viscii-lower . "Viet Nam")
+ (vietnamese-viscii-upper . "Viet Nam")
diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el
---- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600
-+++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700
+--- xemacs-21.5.29.ORIG/lisp/unicode.el 2010-01-07 09:52:09.262618232 -0700
++++ xemacs-21.5.29/lisp/unicode.el 2010-01-07 09:31:59.524639374 -0700
@@ -73,6 +73,7 @@
("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80)
("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80)
@@ -159,3 +153,81 @@ diff -dur xemacs-21.5.29.ORIG/lisp/unico
("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80)
("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80)
("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80)
+@@ -153,7 +154,7 @@
+ '(ascii control-1 latin-iso8859-1 latin-iso8859-2 latin-iso8859-15
+ greek-iso8859-7 hebrew-iso8859-8 ipa cyrillic-iso8859-5
+ latin-iso8859-16 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9
+- vietnamese-viscii-lower vietnamese-viscii-upper
++ vietnamese-viscii-lower vietnamese-viscii-upper arabic-iso8859-6
+ jit-ucs-charset-0 japanese-jisx0208 japanese-jisx0208-1978
+ japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2
+ chinese-gb2312 chinese-sisheng chinese-big5-1 chinese-big5-2
+diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog
+--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:52:09.282677438 -0700
++++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700
+@@ -1,3 +1,11 @@
++2010-01-07 Aidan Kehoe <kehoea at parhasard.net>
++
++ * mule-charset.c:
++ (syms_of_mule_charset, complex_vars_of_mule_charset):
++ * lisp.h:
++ Restore the creation of arabic-iso8859-6 in C, having it in Lisp
++ isn't sufficient for X11 input to work.
++
+ 2009-05-18 Stephen J. Turnbull <stephen at xemacs.org>
+
+ * XEmacs 21.5.29 "garbanzo" is released.
+diff -dur xemacs-21.5.29.ORIG/src/lisp.h xemacs-21.5.29/src/lisp.h
+--- xemacs-21.5.29.ORIG/src/lisp.h 2010-01-07 09:52:09.288552467 -0700
++++ xemacs-21.5.29/src/lisp.h 2010-01-07 09:31:59.541637463 -0700
+@@ -5233,6 +5233,7 @@
+ extern Lisp_Object Vcharset_latin_iso8859_4;
+ extern Lisp_Object Vcharset_thai_tis620;
+ extern Lisp_Object Vcharset_greek_iso8859_7;
++extern Lisp_Object Vcharset_arabic_iso8859_6;
+ extern Lisp_Object Vcharset_hebrew_iso8859_8;
+ extern Lisp_Object Vcharset_katakana_jisx0201;
+ extern Lisp_Object Vcharset_latin_jisx0201;
+diff -dur xemacs-21.5.29.ORIG/src/mule-charset.c xemacs-21.5.29/src/mule-charset.c
+--- xemacs-21.5.29.ORIG/src/mule-charset.c 2010-01-07 09:52:09.290552365 -0700
++++ xemacs-21.5.29/src/mule-charset.c 2010-01-07 09:53:06.329578948 -0700
+@@ -47,6 +47,7 @@
+ Lisp_Object Vcharset_latin_iso8859_4;
+ Lisp_Object Vcharset_thai_tis620;
+ Lisp_Object Vcharset_greek_iso8859_7;
++Lisp_Object Vcharset_arabic_iso8859_6;
+ Lisp_Object Vcharset_hebrew_iso8859_8;
+ Lisp_Object Vcharset_katakana_jisx0201;
+ Lisp_Object Vcharset_latin_jisx0201;
+@@ -93,6 +94,7 @@
+ Qlatin_iso8859_4,
+ Qthai_tis620,
+ Qgreek_iso8859_7,
++ Qarabic_iso8859_6,
+ Qhebrew_iso8859_8,
+ Qkatakana_jisx0201,
+ Qlatin_jisx0201,
+@@ -1110,6 +1112,7 @@
+ DEFSYMBOL (Qlatin_iso8859_4);
+ DEFSYMBOL (Qthai_tis620);
+ DEFSYMBOL (Qgreek_iso8859_7);
++ DEFSYMBOL (Qarabic_iso8859_6);
+ DEFSYMBOL (Qhebrew_iso8859_8);
+ DEFSYMBOL (Qkatakana_jisx0201);
+ DEFSYMBOL (Qlatin_jisx0201);
+@@ -1233,6 +1236,15 @@
+ build_msg_string ("ISO8859-7 (Greek)"),
+ build_msg_string ("ISO8859-7 (Greek)"),
+ vector1(build_string("iso8859-7")), 0, 0);
++ staticpro (&Vcharset_arabic_iso8859_6);
++ Vcharset_arabic_iso8859_6 =
++ make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2,
++ CHARSET_TYPE_96, 1, 1, 'G',
++ CHARSET_RIGHT_TO_LEFT,
++ build_string ("ISO8859-6"),
++ build_msg_string ("ISO8859-6 (Arabic)"),
++ build_msg_string ("ISO8859-6 (Arabic)"),
++ vector1(build_string ("iso8859-6")), 0, 0);
+ staticpro (&Vcharset_hebrew_iso8859_8);
+ Vcharset_hebrew_iso8859_8 =
+ make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2,
Index: xemacs-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-snapshot.sh 12 Mar 2009 17:01:29 -0000 1.1
+++ xemacs-snapshot.sh 7 Jan 2010 17:05:12 -0000 1.2
@@ -30,5 +30,5 @@ hg identify | cut -d " " -f 1 >> version
rm -r .hg*
cd ..
tar cf "$pwd/$tarball" xemacs-beta
-lzma -f "$pwd/$tarball"
+xz -f "$pwd/$tarball"
cd - >/dev/null
Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- xemacs.spec 21 Dec 2009 23:27:03 -0000 1.59
+++ xemacs.spec 7 Jan 2010 17:05:12 -0000 1.60
@@ -22,14 +22,14 @@
Name: xemacs
Version: 21.5.29
-Release: 10%{?snap:.%{snap}}%{?dist}
+Release: 11%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
License: GPLv2+
URL: http://www.xemacs.org/
%if 0%{?snap:1}
-Source0: %{name}-%{snap}.tar.lzma
+Source0: %{name}-%{snap}.tar.xz
%else
Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz
%endif
@@ -58,14 +58,13 @@ Patch10: %{name}-21.5.29-tty-font
Patch11: %{name}-21.5.29-etags-memmove-545399.patch
# Applied upstream 2009-12-21
Patch12: %{name}-21.5.29-arabic-547840.patch
+# Applied upstream 2009-01-07
+Patch13: %{name}-21.5.29-dired-550145.patch
# Sent upstream 2009-03-12
Patch14: %{name}-beta-infodir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?snap:1}
-BuildRequires: lzma
-%endif
BuildRequires: autoconf
BuildRequires: sed >= 3.95
BuildRequires: texinfo
@@ -232,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
%patch14 -p1
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -595,6 +595,11 @@ fi
%changelog
+* Thu Jan 7 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-11
+- New upstream patch for bz 547840.
+- Add dired patch for large files (bz 550145).
+- Replace "lzma" with "xz" for snapshots.
+
* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
- Don't crash with a Persian keyboard layout (bz 547840)
- Previous message (by thread): rpms/xemacs/F-11 xemacs-21.5.29-dired-550145.patch, NONE, 1.1 xemacs-21.5.29-arabic-547840.patch, 1.1, 1.2 xemacs-snapshot.sh, 1.1, 1.2 xemacs.spec, 1.57, 1.58
- Next message (by thread): rpms/xemacs/devel xemacs-21.5.29-dired-550145.patch, NONE, 1.1 xemacs-21.5.29-arabic-547840.patch, 1.1, 1.2 xemacs-snapshot.sh, 1.1, 1.2 xemacs.spec, 1.59, 1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list