From c4b32592014bf17db070330fcaf1338e6a1449ba3342975c4a7748f639c076ac Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 20 Dec 2007 15:57:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=26 --- bugzilla-294746-support-windows-1252.patch | 53 ---------------------- cast-pointer-integer-different-size.patch | 20 -------- xemacs-21.5.28.20070807.tar.bz2 | 3 -- xemacs-21.5.28.20071220.tar.bz2 | 3 ++ xemacs.changes | 6 +++ xemacs.spec | 11 +++-- 6 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 bugzilla-294746-support-windows-1252.patch delete mode 100644 xemacs-21.5.28.20070807.tar.bz2 create mode 100644 xemacs-21.5.28.20071220.tar.bz2 diff --git a/bugzilla-294746-support-windows-1252.patch b/bugzilla-294746-support-windows-1252.patch deleted file mode 100644 index 67ef40d..0000000 --- a/bugzilla-294746-support-windows-1252.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 a963644..12c5f2f 100644 --- a/cast-pointer-integer-different-size.patch +++ b/cast-pointer-integer-different-size.patch @@ -51,26 +51,6 @@ diff -ru xemacs-21.5.28.20070726.orig/src/event-unixoid.c xemacs-21.5.28.2007072 *instream = (infd >= 0 ? make_filedesc_input_stream (infd, 0, -1, 0) -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 @@ - */ - - #include -+#include - #include "lisp.h" - - #include "buffer.h" -@@ -713,7 +714,7 @@ - - if (converter_data) - { -- Boolean free_p = (Boolean) (int) converter_data; -+ Boolean free_p = (Boolean) (int) (intptr_t) converter_data; - XIMStyles *styles = (XIMStyles *) toVal->addr; - if (free_p) - XFree ( styles->supported_styles ); 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 diff --git a/xemacs-21.5.28.20070807.tar.bz2 b/xemacs-21.5.28.20070807.tar.bz2 deleted file mode 100644 index 031abd0..0000000 --- a/xemacs-21.5.28.20070807.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90199dd2c08f928d6402bfa7258d79325841ba203daa9783bb974716f60c861a -size 10094896 diff --git a/xemacs-21.5.28.20071220.tar.bz2 b/xemacs-21.5.28.20071220.tar.bz2 new file mode 100644 index 0000000..84ecf2e --- /dev/null +++ b/xemacs-21.5.28.20071220.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc72b166a7f136efea944dc0720c029bf42fe850b7ca67fb8ee81580f4cfd786 +size 10023222 diff --git a/xemacs.changes b/xemacs.changes index f5455a2..78879d3 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 20 16:34:22 CET 2007 - ro@suse.de + +- update to CVS of 20071220 +- deleted bugzilla-294746-support-windows-1252.patch (upstream) + ------------------------------------------------------------------- Fri Dec 14 16:14:36 CET 2007 - ro@suse.de diff --git a/xemacs.spec b/xemacs.spec index 8daaf03..41fe1c2 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.28.20070807) +# spec file for package xemacs (Version 21.5.28.20071220) # # 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.20070807 -Release: 46 +Version: 21.5.28.20071220 +Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -85,7 +85,6 @@ Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch -Patch294746: bugzilla-294746-support-windows-1252.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch %description @@ -175,7 +174,6 @@ Authors: %patch43 -p1 %patch45 -p0 %patch292811 -p1 -%patch294746 -p1 %patch301352 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f @@ -579,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Thu Dec 20 2007 - ro@suse.de +- update to CVS of 20071220 +- deleted bugzilla-294746-support-windows-1252.patch (upstream) * Fri Dec 14 2007 - ro@suse.de - move /etc/skel/.xemacs/init.el to this package * Wed Dec 05 2007 - mfabian@suse.de