From 08f3a20346dc61487f667d9ab9ac4b9c0a31c9f56f4a3d964f1f5aeaf49d0c2f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Aug 2007 20:55:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=20 --- w3-xft-problem.patch | 64 --------------------------------- xemacs-21.5.28.20070803.tar.bz2 | 3 -- xemacs-21.5.28.20070807.tar.bz2 | 3 ++ xemacs.changes | 10 ++++++ xemacs.spec | 15 +++++--- 5 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 w3-xft-problem.patch delete mode 100644 xemacs-21.5.28.20070803.tar.bz2 create mode 100644 xemacs-21.5.28.20070807.tar.bz2 diff --git a/w3-xft-problem.patch b/w3-xft-problem.patch deleted file mode 100644 index 1a5a181..0000000 --- a/w3-xft-problem.patch +++ /dev/null @@ -1,64 +0,0 @@ -lisp/ChangeLog addition: - -2007-08-03 Aidan Kehoe - - * font.el (x-font-create-object): - When handed an XFT font name string, parse it as such. - * font.el (font-xft-font-regexp): - Don't check for the existence of xft-font-regexp; accept escaped - dashes and colons in font family names. - - -XEmacs Trunk source patch: -Diff command: cvs -q diff -u -Files affected: lisp/font.el -=================================================================== -RCS - -Index: lisp/font.el -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v -retrieving revision 1.20 -diff -u -r1.20 font.el ---- lisp/font.el 2006/04/25 14:01:53 1.20 -+++ lisp/font.el 2007/08/03 13:31:05 -@@ -587,7 +587,13 @@ - (let ((case-fold-search t)) - (if (or (not (stringp fontname)) - (not (string-match font-x-font-regexp fontname))) -- (make-font) -+ (if (and (stringp fontname) -+ (string-match font-xft-font-regexp fontname)) -+ ;; Return an XFT font. -+ (xft-font-create-object fontname) -+ ;; It's unclear how to parse the font; return an unspecified -+ ;; one. -+ (make-font)) - (let ((family nil) - (size nil) - (weight (match-string 1 fontname)) -@@ -751,16 +757,15 @@ - ;;; #### FIXME actually, this section should be fc-*, right? - - (defvar font-xft-font-regexp -- ;; #### FIXME what the fuck?!? -- (when (and (boundp 'xft-font-regexp) xft-font-regexp) -- (concat "\\`" -- "[^:-]*" ; optional foundry and family -- ; incorrect, escaping exists -- "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?" ; optional size (points) -- "\\(:[^:]*\\)*" ; optional properties -+ (concat "\\`" -+ #r"\(\\-\|\\:\|[^:-]\)*" ; optional foundry and family -+ ; (allows for escaped colons, -+ ; dashes.) -+ "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?" ; optional size (points) -+ "\\(:[^:]*\\)*" ; optional properties - ; not necessarily key=value!! - "\\'" -- ))) -+ )) - - (defvar font-xft-family-mappings - ;; #### FIXME this shouldn't be needed or used for Xft - diff --git a/xemacs-21.5.28.20070803.tar.bz2 b/xemacs-21.5.28.20070803.tar.bz2 deleted file mode 100644 index c2df648..0000000 --- a/xemacs-21.5.28.20070803.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5df022e1f106aa2fa64ee1af093a135aee2fb0a54cf5a0aea50c8e1303c9bb3d -size 10090401 diff --git a/xemacs-21.5.28.20070807.tar.bz2 b/xemacs-21.5.28.20070807.tar.bz2 new file mode 100644 index 0000000..031abd0 --- /dev/null +++ b/xemacs-21.5.28.20070807.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90199dd2c08f928d6402bfa7258d79325841ba203daa9783bb974716f60c861a +size 10094896 diff --git a/xemacs.changes b/xemacs.changes index 58a5be7..6cf9214 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 07 14:54:13 CEST 2007 - mfabian@suse.de + +- update to 21.5.28.20070807. +- remove w3-xft-problem.patch (included now). +- UTF-8 and UTF-16 handling is now more robust, for example + when a non-UTF-8 file is opened as UTF-8, one change made, + and immediately saved, the non-ASCII characters are not + corrupted. + ------------------------------------------------------------------- Fri Aug 03 15:56:21 CEST 2007 - mfabian@suse.de diff --git a/xemacs.spec b/xemacs.spec index a0e2c17..87ae7a0 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.28.20070803) +# spec file for package xemacs (Version 21.5.28.20070807) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,7 +36,7 @@ Prereq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv Autoreqprov: on -Version: 21.5.28.20070803 +Version: 21.5.28.20070807 Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,7 +82,6 @@ Patch40: cast-pointer-integer-different-size.patch Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch -Patch44: w3-xft-problem.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 @@ -171,9 +170,8 @@ Authors: %patch38 -p1 %patch40 -p1 %patch41 -p1 -%patch42 -p1 +#%patch42 -p1 %patch43 -p1 -%patch44 -p0 %patch45 -p0 %patch292811 -p1 %patch294746 -p1 @@ -571,6 +569,13 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Tue Aug 07 2007 - mfabian@suse.de +- update to 21.5.28.20070807. +- remove w3-xft-problem.patch (included now). +- UTF-8 and UTF-16 handling is now more robust, for example + when a non-UTF-8 file is opened as UTF-8, one change made, + and immediately saved, the non-ASCII characters are not + corrupted. * Fri Aug 03 2007 - mfabian@suse.de - update to 21.5.28.20070803. - add patch by Aidan Kehoe to make ‘w3’ work in an Xft build