rpms/xemacs/F-11 xemacs-21.5.29-no-xft.patch, 1.1, 1.2 xemacs.spec, 1.49, 1.50

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/F-11

Modified Files:
	xemacs-21.5.29-no-xft.patch xemacs.spec 
Log Message:
* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.


xemacs-21.5.29-no-xft.patch:
 font-mgr.el |    3 ++-
 font.el     |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

Index: xemacs-21.5.29-no-xft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.29-no-xft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.29-no-xft.patch	24 Aug 2009 21:11:29 -0000	1.1
+++ xemacs-21.5.29-no-xft.patch	26 Aug 2009 20:57:27 -0000	1.2
@@ -1,10 +1,52 @@
---- xemacs-21.5.29/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/font.el	2009-08-24 13:24:14.634385245 -0600
-@@ -582,6 +582,7 @@
-     (if (or (not (stringp fontname))
- 	    (not (string-match font-x-font-regexp fontname)))
- 	(if (and (stringp fontname)
-+		 (featurep 'xft-fonts)
- 		 (string-match font-xft-font-regexp fontname))
- 	    ;; Return an XFT font. 
- 	    (xft-font-create-object fontname)
+diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el
+--- xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:58.859385283 -0600
++++ xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:20.000998807 -0600
+@@ -753,14 +753,23 @@
+ 
+ (defvar font-xft-font-regexp
+   (concat "\\`"
+-	  #r"\(\\-\|\\:\|\\,\|[^:-]\)*"	        ; optional foundry and family
++	  #r"\(\\[-,]|[^-:,*]\)*"               ; optional foundry and family
+ 						; (allows for escaped colons, 
+-						; dashes, commas)
++						; dashes, commas, asterisks)
+ 	  "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?"	; optional size (points)
+ 	  "\\(:[^:]*\\)*"			; optional properties
+ 						; not necessarily key=value!!
+ 	    "\\'"
+-	    ))
++	    )
++  "Regexp matching fontconfig font names.
++Unfortunately, there is no explicit standard specifying these.  We disallow
++hyphen and comma in family names unless escaped, because they have a syntactic
++role in fontconfig names.  We disallow colon because it is part of fontconfig
++name syntax, and asterisk because of the potential for confusion with an XLFD.
++We do not allow escapes for colon and asterisk because the fontconfig
++documentation doesn't specify whether they can be escaped, or how a redundant
++escape character is treated.
++#### The name of this variable is subject to change.")
+ 
+ (defvar font-xft-family-mappings
+   ;; #### FIXME this shouldn't be needed or used for Xft
+@@ -799,6 +808,8 @@
+   "Return a font descriptor object for FONTNAME, appropriate for Xft.
+ 
+ Optional DEVICE defaults to `default-x-device'."
++  (unless (featurep 'font-mgr)
++    (error 'unimplemented 'font-mgr "fontconfig-style font names"))
+   (let* ((name fontname)
+ 	 (device (or device (default-x-device)))
+ 	 (pattern (fc-font-match device (fc-name-parse name)))
+diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el
+--- xemacs-21.5.29/lisp/font-mgr.el	2009-05-18 08:51:06.000000000 -0600
++++ xemacs-21.5.29/lisp/font-mgr.el	2009-08-26 14:46:44.073953826 -0600
+@@ -39,7 +39,8 @@
+ 
+ ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'?
+ 
+-(provide 'font-mgr)
++;; #### implementation is incomplete
++;; (provide 'font-mgr)
+ 
+ (defvar xft-xlfd-font-regexp
+   (concat


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xemacs.spec	24 Aug 2009 21:11:30 -0000	1.49
+++ xemacs.spec	26 Aug 2009 20:57:27 -0000	1.50
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        2%{?snap:.%{snap}}%{?dist}
+Release:        3%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -45,7 +45,7 @@ Patch2:         %{name}-21.5.29-image-ov
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
-# Sent upstream 2009-08-24
+# Proposed by upstream 2009-08-25
 Patch6:         %{name}-21.5.29-no-xft.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
@@ -558,6 +558,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
+- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-2
 - Fix image overflow bug (CVE-2009-2688).
 - Fix calling xft-font-create-object in non-Xft builds (#512623).