diff --git a/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch b/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch deleted file mode 100644 index e1e831e..0000000 --- a/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ru xemacs-21.5.28.orig/etc/unicode/unicode-consortium/BIG5.TXT xemacs-21.5.28/etc/unicode/unicode-consortium/BIG5.TXT ---- xemacs-21.5.28.orig/etc/unicode/unicode-consortium/BIG5.TXT 2007-05-07 16:27:16.000000000 +0200 -+++ xemacs-21.5.28/etc/unicode/unicode-consortium/BIG5.TXT 2007-07-20 17:24:54.000000000 +0200 -@@ -118,7 +118,7 @@ - 0xA157 0xFE31 # PRESENTATION FORM FOR VERTICAL EM DASH - 0xA158 0x2014 # EM DASH - 0xA159 0xFE33 # PRESENTATION FORM FOR VERTICAL LOW LINE --0xA15A 0xFFFD # *** NO MAPPING *** -+0xA15A 0xFA15A # Private Use Area - 0xA15B 0xFE34 # PRESENTATION FORM FOR VERTICAL WAVY LOW LINE - 0xA15C 0xFE4F # WAVY LOW LINE - 0xA15D 0xFF08 # FULLWIDTH LEFT PARENTHESIS -@@ -189,9 +189,9 @@ - 0xA1C0 0x32A3 # CIRCLED IDEOGRAPH CORRECT - 0xA1C1 0x2105 # CARE OF - 0xA1C2 0x203E # OVERLINE --0xA1C3 0xFFFD # *** NO MAPPING *** -+0xA1C3 0xFA1C3 # Private Use Area - 0xA1C4 0xFF3F # FULLWIDTH LOW LINE --0xA1C5 0xFFFD # *** NO MAPPING *** -+0xA1C5 0xFA1C5 # Private Use Area - 0xA1C6 0xFE49 # DASHED OVERLINE - 0xA1C7 0xFE4A # CENTRELINE OVERLINE - 0xA1C8 0xFE4D # DASHED LOW LINE -@@ -248,8 +248,8 @@ - 0xA1FB 0x2198 # SOUTH EAST ARROW - 0xA1FC 0x2225 # PARALLEL TO - 0xA1FD 0x2223 # DIVIDES --0xA1FE 0xFFFD # *** NO MAPPING *** --0xA240 0xFFFD # *** NO MAPPING *** -+0xA1FE 0xFA1FE # Private Use Area -+0xA240 0xFA240 # Private Use Area - 0xA241 0xFF0F # FULLWIDTH SOLIDUS - 0xA242 0xFF3C # FULLWIDTH REVERSE SOLIDUS - 0xA243 0xFF04 # FULLWIDTH DOLLAR SIGN -@@ -355,9 +355,9 @@ - 0xA2C9 0x3027 # HANGZHOU NUMERAL SEVEN - 0xA2CA 0x3028 # HANGZHOU NUMERAL EIGHT - 0xA2CB 0x3029 # HANGZHOU NUMERAL NINE --0xA2CC 0xFFFD # *** NO MAPPING *** -+0xA2CC 0xFA2CC # Private Use Area - 0xA2CD 0x5344 # --0xA2CE 0xFFFD # *** NO MAPPING *** -+0xA2CE 0xFA2CE # Private Use Area - 0xA2CF 0xFF21 # FULLWIDTH LATIN CAPITAL LETTER A - 0xA2D0 0xFF22 # FULLWIDTH LATIN CAPITAL LETTER B - 0xA2D1 0xFF23 # FULLWIDTH LATIN CAPITAL LETTER C diff --git a/bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch b/bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch new file mode 100644 index 0000000..2d0a4e3 --- /dev/null +++ b/bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch @@ -0,0 +1,12 @@ +--- xemacs-21.5.28.20070730.orig/lisp/startup.el 2007-07-26 15:22:08.000000000 +0200 ++++ xemacs-21.5.28.20070730/lisp/startup.el 2007-07-30 15:08:05.000000000 +0200 +@@ -712,6 +712,9 @@ + ;; initialisation in case of keysyms of the form UABCD. + (when (featurep 'mule) + (declare-fboundp (init-mule-at-startup))) ++ ++ (set-language-unicode-precedence-list ++ '(ascii latin-iso8859-1 latin-iso8859-2 latin-iso8859-3 latin-iso8859-4 jit-ucs-charset-0 thai-tis620 greek-iso8859-7 arabic-iso8859-6 hebrew-iso8859-8 katakana-jisx0201 latin-jisx0201 cyrillic-iso8859-5 latin-iso8859-9 latin-iso8859-15 composite control-1 japanese-jisx0208-1978 chinese-gb2312 japanese-jisx0208 korean-ksc5601 japanese-jisx0212 chinese-cns11643-1 chinese-cns11643-2 chinese-big5-1 chinese-big5-2 arabic-digit arabic-1-column arabic-2-column chinese-sisheng latin-iso8859-16 indian-is13194 lao latin-iso8859-14 ipa vietnamese-viscii-upper vietnamese-viscii-lower jit-ucs-charset-0 chinese-cns11643-3 chinese-cns11643-4 chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-7 chinese-isoir165 ethiopic indian-2-column indian-1-column japanese-jisx0213-1 japanese-jisx0213-2 thai-xtis tibetan tibetan-1-column)) + + (if (featurep 'toolbar) + (if (featurep 'infodock) diff --git a/bugzilla-294746-support-windows-1252.patch b/bugzilla-294746-support-windows-1252.patch new file mode 100644 index 0000000..67ef40d --- /dev/null +++ b/bugzilla-294746-support-windows-1252.patch @@ -0,0 +1,53 @@ +xemacs-21.5.28.20070726/lisp/mule/CVSだけに発見: Base +xemacs-21.5.28.20070726/lisp/mule/CVSだけに発見: Baserev +diff -ru xemacs-21.5.28.20070726.orig/lisp/mule/latin.el xemacs-21.5.28.20070726/lisp/mule/latin.el +--- xemacs-21.5.28.20070726.orig/lisp/mule/latin.el 2007-07-26 15:22:13.000000000 +0200 ++++ xemacs-21.5.28.20070726/lisp/mule/latin.el 2007-07-27 12:32:37.000000000 +0200 +@@ -628,6 +628,47 @@ + + ;; end of ISO-8859-9 + ++;; Microsoft's Code Page 1252, for Western Europe and the Americas ++ ++(make-8-bit-coding-system ++ 'windows-1252 ++ (list ++ (list #x80 (decode-char 'ucs #x20AC)) ;; EURO SIGN ++ (list #x82 (decode-char 'ucs #x201A)) ;; SINGLE LOW-9 QUOTATION MARK ++ (list #x83 (decode-char 'ucs #x0192)) ;; LATIN SMALL LETTER F WITH HOOK ++ (list #x84 (decode-char 'ucs #x201E)) ;; DOUBLE LOW-9 QUOTATION MARK ++ (list #x85 (decode-char 'ucs #x2026)) ;; HORIZONTAL ELLIPSIS ++ (list #x86 (decode-char 'ucs #x2020)) ;; DAGGER ++ (list #x87 (decode-char 'ucs #x2021)) ;; DOUBLE DAGGER ++ (list #x88 (decode-char 'ucs #x02C6)) ;; MODIFIER LETTER CIRCUMFLEX ACCENT ++ (list #x89 (decode-char 'ucs #x2030)) ;; PER MILLE SIGN ++ (list #x8A (decode-char 'ucs #x0160)) ;; LATIN CAPITAL LETTER S WITH CARON ++ (list #x8B (decode-char 'ucs #x2039)) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK ++ (list #x8C (decode-char 'ucs #x0152)) ;; LATIN CAPITAL LIGATURE OE ++ (list #x8E (decode-char 'ucs #x017D)) ;; LATIN CAPITAL LETTER Z WITH CARON ++ (list #x91 (decode-char 'ucs #x2018)) ;; LEFT SINGLE QUOTATION MARK ++ (list #x92 (decode-char 'ucs #x2019)) ;; RIGHT SINGLE QUOTATION MARK ++ (list #x93 (decode-char 'ucs #x201C)) ;; LEFT DOUBLE QUOTATION MARK ++ (list #x94 (decode-char 'ucs #x201D)) ;; RIGHT DOUBLE QUOTATION MARK ++ (list #x95 (decode-char 'ucs #x2022)) ;; BULLET ++ (list #x96 (decode-char 'ucs #x2013)) ;; EN DASH ++ (list #x97 (decode-char 'ucs #x2014)) ;; EM DASH ++ (list #x98 (decode-char 'ucs #x02DC)) ;; SMALL TILDE ++ (list #x99 (decode-char 'ucs #x2122)) ;; TRADE MARK SIGN ++ (list #x9A (decode-char 'ucs #x0161)) ;; LATIN SMALL LETTER S WITH CARON ++ (list #x9B (decode-char 'ucs #x203A)) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK ++ (list #x9C (decode-char 'ucs #x0153)) ;; LATIN SMALL LIGATURE OE ++ (list #x9E (decode-char 'ucs #x017E)) ;; LATIN SMALL LETTER Z WITH CARON ++ (list #x9F (decode-char 'ucs #x0178)));; LATIN CAPITAL LETTER Y WITH DIAERESIS ++ "Microsoft's Code Page 1252, for Western Europe and the Americas." ++ '(mnemonic "cp1252" ++ documentation ++ "This is an extension of ISO 8859-1 that provides the Euro sign and ++several punctuation marks not otherwise available in ISO 8859 1. It is ++incompatible with ISO 2022, which is not a problem in the regions ++where it is used. " ++ aliases (cp1252))) ++ + ;; This is a utility function; we don't want it in the dumped XEmacs. + + (fmakunbound 'setup-case-pairs) diff --git a/cast-pointer-integer-different-size.patch b/cast-pointer-integer-different-size.patch index 6f7c34b..a963644 100644 --- a/cast-pointer-integer-different-size.patch +++ b/cast-pointer-integer-different-size.patch @@ -1,6 +1,6 @@ -diff -ru xemacs-21.5.24.orig/src/eval.c xemacs-21.5.24/src/eval.c ---- xemacs-21.5.24.orig/src/eval.c 2005-12-27 18:12:06.000000000 +0100 -+++ xemacs-21.5.24/src/eval.c 2006-02-17 12:22:23.000000000 +0100 +diff -ru xemacs-21.5.28.20070726.orig/src/eval.c xemacs-21.5.28.20070726/src/eval.c +--- xemacs-21.5.28.20070726.orig/src/eval.c 2007-07-26 15:22:25.000000000 +0200 ++++ xemacs-21.5.28.20070726/src/eval.c 2007-07-26 17:15:07.000000000 +0200 @@ -136,6 +136,7 @@ */ @@ -9,25 +9,27 @@ diff -ru xemacs-21.5.24.orig/src/eval.c xemacs-21.5.24/src/eval.c #include "lisp.h" #include "commands.h" -@@ -5974,13 +5975,13 @@ +@@ -6007,7 +6008,7 @@ Lisp_Object opaque = XCAR (cons); Lisp_Object lval = XCDR (cons); int *addr = (int *) get_opaque_ptr (opaque); - int val; + intptr_t val; - if (INTP (lval)) - val = XINT (lval); + /* In the event that a C integer will always fit in an Emacs int, we + haven't ever stored a C integer as an opaque pointer. This #ifdef +@@ -6020,7 +6021,7 @@ + } else { - val = (int) get_opaque_ptr (lval); + val = (intptr_t) get_opaque_ptr (lval); free_opaque_ptr (lval); } - -diff -ru xemacs-21.5.24.orig/src/event-unixoid.c xemacs-21.5.24/src/event-unixoid.c ---- xemacs-21.5.24.orig/src/event-unixoid.c 2003-02-07 12:50:53.000000000 +0100 -+++ xemacs-21.5.24/src/event-unixoid.c 2006-02-17 12:50:18.000000000 +0100 + #else /* !(INT_VALBITS < INTBITS) */ +diff -ru xemacs-21.5.28.20070726.orig/src/event-unixoid.c xemacs-21.5.28.20070726/src/event-unixoid.c +--- xemacs-21.5.28.20070726.orig/src/event-unixoid.c 2007-07-26 15:22:25.000000000 +0200 ++++ xemacs-21.5.28.20070726/src/event-unixoid.c 2007-07-26 17:16:53.000000000 +0200 @@ -27,6 +27,7 @@ /* This file has been Mule-ized. */ @@ -36,22 +38,22 @@ diff -ru xemacs-21.5.24.orig/src/event-unixoid.c xemacs-21.5.24/src/event-unixoi #include "lisp.h" #include "console-stream-impl.h" -@@ -361,9 +362,9 @@ - /* Decode inhandle and outhandle. Their meaning depends on +@@ -362,9 +363,9 @@ the process implementation being used. */ - /* We are passed plain old file descs */ -- infd = (int) inhandle; -- outfd = (int) outhandle; -- errfd = (int) errhandle; -+ infd = (int) (intptr_t) inhandle; -+ outfd = (int) (intptr_t) outhandle; -+ errfd = (int) (intptr_t) errhandle; + /* We are passed plain old file descs, which are ints, so */ + /* if sizeof(EMACS_INT) > sizeof(int) it's OK. */ +- infd = (EMACS_INT) inhandle; +- outfd = (EMACS_INT) outhandle; +- errfd = (EMACS_INT) errhandle; ++ infd = (EMACS_INT) (intptr_t) inhandle; ++ outfd = (EMACS_INT) (intptr_t) outhandle; ++ errfd = (EMACS_INT) (intptr_t) errhandle; *instream = (infd >= 0 ? make_filedesc_input_stream (infd, 0, -1, 0) -diff -ru xemacs-21.5.24.orig/src/input-method-xlib.c xemacs-21.5.24/src/input-method-xlib.c ---- xemacs-21.5.24.orig/src/input-method-xlib.c 2005-01-25 00:33:59.000000000 +0100 -+++ xemacs-21.5.24/src/input-method-xlib.c 2006-02-17 12:54:58.000000000 +0100 +diff -ru xemacs-21.5.28.20070726.orig/src/input-method-xlib.c xemacs-21.5.28.20070726/src/input-method-xlib.c +--- xemacs-21.5.28.20070726.orig/src/input-method-xlib.c 2006-07-05 15:53:37.000000000 +0200 ++++ xemacs-21.5.28.20070726/src/input-method-xlib.c 2007-07-26 17:18:08.000000000 +0200 @@ -70,6 +70,7 @@ */ @@ -60,7 +62,7 @@ diff -ru xemacs-21.5.24.orig/src/input-method-xlib.c xemacs-21.5.24/src/input-me #include "lisp.h" #include "buffer.h" -@@ -708,7 +709,7 @@ +@@ -713,7 +714,7 @@ if (converter_data) { @@ -69,25 +71,25 @@ diff -ru xemacs-21.5.24.orig/src/input-method-xlib.c xemacs-21.5.24/src/input-me XIMStyles *styles = (XIMStyles *) toVal->addr; if (free_p) XFree ( styles->supported_styles ); -diff -ru xemacs-21.5.24.orig/src/process-unix.c xemacs-21.5.24/src/process-unix.c ---- xemacs-21.5.24.orig/src/process-unix.c 2005-02-04 05:06:34.000000000 +0100 -+++ xemacs-21.5.24/src/process-unix.c 2006-02-17 12:56:36.000000000 +0100 +diff -ru xemacs-21.5.28.20070726.orig/src/process-unix.c xemacs-21.5.28.20070726/src/process-unix.c +--- xemacs-21.5.28.20070726.orig/src/process-unix.c 2007-07-26 15:22:26.000000000 +0200 ++++ xemacs-21.5.28.20070726/src/process-unix.c 2007-07-26 17:19:24.000000000 +0200 @@ -31,6 +31,7 @@ written by Wolfgang S. Rupprecht */ #include -+#include ++#include #if !defined (NO_SUBPROCESSES) -@@ -846,8 +847,8 @@ - unix_init_process_io_handles (Lisp_Process *p, void *in, void *UNUSED (out), +@@ -847,8 +848,8 @@ void *err, int UNUSED (flags)) { -- UNIX_DATA(p)->infd = (int) in; -- UNIX_DATA(p)->errfd = (int) err; -+ UNIX_DATA(p)->infd = (int) (intptr_t) in; -+ UNIX_DATA(p)->errfd = (int) (intptr_t) err; + /* if sizeof(EMACS_INT) > sizeof(int) this truncates the value */ +- UNIX_DATA(p)->infd = (EMACS_INT) in; +- UNIX_DATA(p)->errfd = (EMACS_INT) err; ++ UNIX_DATA(p)->infd = (EMACS_INT) (intptr_t) in; ++ UNIX_DATA(p)->errfd = (EMACS_INT) (intptr_t) err; } /* Move the file descriptor FD so that its number is not less than MIN. * diff --git a/xemacs-21.5.28.20070730.tar.bz2 b/xemacs-21.5.28.20070730.tar.bz2 new file mode 100644 index 0000000..e20a354 --- /dev/null +++ b/xemacs-21.5.28.20070730.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b5cea0897163c7330d8f626fd45292c5c62974217eb5fbd95053eb40698d48a +size 10092834 diff --git a/xemacs-21.5.28.tar.bz2 b/xemacs-21.5.28.tar.bz2 deleted file mode 100644 index f99d97c..0000000 --- a/xemacs-21.5.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66b43554f2bbb659efd449ed9ea11f5922dc260d409a4b8f72e81fba754397e8 -size 10082344 diff --git a/xemacs-vendor.patch b/xemacs-vendor.patch deleted file mode 100644 index 0da9927..0000000 --- a/xemacs-vendor.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru xemacs-21.4.15.orig/lisp/x-init.el xemacs-21.4.15/lisp/x-init.el ---- xemacs-21.4.15.orig/lisp/x-init.el 2001-04-12 20:21:40.000000000 +0200 -+++ xemacs-21.4.15/lisp/x-init.el 2004-09-28 17:16:55.881291820 +0200 -@@ -238,7 +238,8 @@ - (string-equal "X Consortium" vendor)) - ;; Ok, we think this could be a Sun keyboard. Run the Sun code. - (x-win-init-sun)) -- ((string-match "XFree86" vendor) -+ ((or (string-match "XFree86" vendor) -+ (string-match "The X.Org Foundation" vendor)) - ;; Those XFree86 people do some weird keysym stuff, too. - (x-win-init-xfree86))))) - diff --git a/xemacs.changes b/xemacs.changes index c19920b..d68c5bd 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jul 30 13:03:37 CEST 2007 - mfabian@suse.de + +- update to 21.5.28.20070730 +- remove bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch + (included upstream). +- set language-unicode-precedence-list in startup.el to get + characters like '”' U+201D (RIGHT DOUBLE QUOTATION MARK) + treated as single width consistently. + +------------------------------------------------------------------- +Thu Jul 26 15:24:35 CEST 2007 - mfabian@suse.de + +- Bugzilla #294746: update to 21.5.28.20070726 to + get support for windows-1252 encoding. +- remove xemacs-vendor.path (included upstream). + ------------------------------------------------------------------- Wed Jul 25 12:11:40 CEST 2007 - mfabian@suse.de diff --git a/xemacs.spec b/xemacs.spec index c06cdf7..97f1fb7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.28) +# spec file for package xemacs (Version 21.5.28.20070730) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,8 +36,8 @@ Prereq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv Autoreqprov: on -Version: 21.5.28 -Release: 21 +Version: 21.5.28.20070730 +Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -53,7 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # cd .. # Now make a tar.bz2 file from the contents of the "packages" directory: # tar jcvf xemacs-.tar.bz2 xemacs-/ -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.28.tar.bz2 +Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.bz2 Source1: xe-list.el Source2: fix-load-history.el Source3: xemacs.desktop @@ -71,7 +71,6 @@ Patch20: xemacs-21.4.13-ppc64.patch Patch22: destdir.patch Patch23: xemacs-ptmx.dif Patch25: gnomebug.patch -Patch26: xemacs-vendor.patch Patch27: xemacs-level3.patch Patch28: xemacs-21.5.18-movemail.patch Patch32: do-not-create-backups-in-temp-directories.patch @@ -79,8 +78,9 @@ Patch33: set-locale-to-c-when-not-supported-by-x.patch Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch Patch38: unitialized-variables.patch Patch40: cast-pointer-integer-different-size.patch +Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch -Patch293109: bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch +Patch294746: bugzilla-294746-support-windows-1252.patch %description This is the current version of XEmacs, formerly known as Lucid-Emacs. @@ -158,7 +158,6 @@ Authors: #%patch24 -p1 #triggers #103040 #%patch25 -p1 -%patch26 -p1 %patch27 -p1 -b .lvl3 %patch28 -p1 -b .movemail %patch32 -p1 @@ -166,8 +165,9 @@ Authors: #%patch34 -p1 %patch38 -p1 %patch40 -p1 +%patch41 -p1 %patch292811 -p1 -%patch293109 -p1 +%patch294746 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f %ifarch ia64 @@ -562,6 +562,17 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Mon Jul 30 2007 - mfabian@suse.de +- update to 21.5.28.20070730 +- remove bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch + (included upstream). +- set language-unicode-precedence-list in startup.el to get + characters like '”' U+201D (RIGHT DOUBLE QUOTATION MARK) + treated as single width consistently. +* Thu Jul 26 2007 - mfabian@suse.de +- Bugzilla #294746: update to 21.5.28.20070726 to + get support for windows-1252 encoding. +- remove xemacs-vendor.path (included upstream). * Wed Jul 25 2007 - mfabian@suse.de - Bugzilla #293109: map the problematic characters in Big5 to the private use area instead of not mapping them at all.