Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at Mon Jun 29 17:22:25 CEST 2009. -------- --- xemacs/xemacs.changes 2009-06-17 12:39:22.000000000 +0200 +++ xemacs/xemacs.changes 2009-06-24 14:34:17.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 24 14:25:42 CEST 2009 - werner@suse.de + +- Disable XFT for now as it does not work well (bnc#502716) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc502716-fontmenu.patch bnc502716-xft.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.Z16580/_old 2009-06-29 17:21:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Z16580/_new 2009-06-29 17:21:11.000000000 +0200 @@ -38,7 +38,7 @@ Conflicts: gnuserv AutoReqProv: on Version: 21.5.29 -Release: 1 +Release: 2 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -92,6 +92,8 @@ Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch +Patch51: bnc502716-fontmenu.patch +Patch52: bnc502716-xft.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -157,6 +159,29 @@ and many other contributors %prep +%ifarch ia64 +%global enable_pdump 0 +%else +%global enable_pdump 0 +%endif +%global enable_dump_in_exec 0 +# Currently XEmacs is not fully usable for Xfreetype support +# therefore we use XFontSet support: +%if %{?_project:1}%{!?_project:0} +%{!?enable_xfs:%global enable_xfs %(echo '%_project'|grep -cE '(SUSE:)?(openSUSE|SLE|Factory)')} +echo Project='%_project' +%else +%if %{?distribution:1}%{!?distribution:0} +%{!?enable_xfs:%global enable_xfs %(echo '%distribution'|grep -cE 'SUSE[:[:blank:]](openSUSE|SLE|Linux|Factory)')} +echo Distribution='%distribution' +%endif +%endif +%{!?enable_xfs:%global enable_xfs 0} +%if ! %enable_xfs +echo Use xft, requires X11, Xft, Xrender, freetype, and fontconfig support. +%else +echo Use xfs, that is XFontSet support for internationalized menubar. +%endif %setup -q -n xemacs-%{version} %patch3 -p1 #%patch5 -p1 -b .fontmenu # appears to be not needed anymore @@ -181,17 +206,14 @@ %patch43 -p1 %patch45 -p0 %patch50 -p1 +%if ! %enable_xfs +%patch51 -p0 +%patch52 -p0 +%endif %patch292811 -p1 %patch301352 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f -%ifarch ia64 -%define enable_pdump 0 -%else -%define enable_pdump 0 -%endif -%define enable_dump_in_exec 0 -%define enable_xft 0%{?opensuse_bs} find . -name CVS -type d | xargs rm -rf find . -name .cvsignore -type f | xargs rm -f chmod -R u+w * @@ -295,7 +317,7 @@ %else --enable-pdump=no \ %endif -%if %enable_xft +%if ! %enable_xfs --with-xft=emacs,menubars,tabs,gauges \ %endif " @@ -339,7 +361,7 @@ # and Romanian texts in the menus. It DOES work with # --with-xim=xlib, the above comment from './configure --help' # seems to be incorrect in that respect.) -%if ! %enable_xft +%if %enable_xfs --with-xfs \ %endif " ++++++ bnc502716-fontmenu.patch ++++++ --- lisp/x-font-menu.el +++ lisp/x-font-menu.el 2009-06-17 13:00:28.066568736 +0000 @@ -166,6 +166,17 @@ It must be set at run-time.") (setcdr dev-cache data) data)) +(defun vassoc-ignore-case (key valist) + "Search VALIST for a vector whose first element is equal to KEY, +but ignores differences in case and text representation. +See also `assoc-ignore-case'." + ;; by Stig@hackvan.com + (let (el) + (catch 'done + (while (setq el (pop valist)) + (and (compare-strings key 0 nil (aref el 0) 0 nil t) + (throw 'done el)))))) + (defun x-reset-device-font-menus-core (device &optional debug) "Generates the `Font', `Size', and `Weight' submenus for the Options menu. This is run the first time that a font-menu is needed for each device. @@ -202,7 +213,7 @@ or if you change your font path, you can (error "internal error")) (setq monospaced-p (string= "m" (match-string 1 name))) (unless (string-match x-fonts-menu-junk-families family) - (setq entry (or (vassoc family cache) + (setq entry (or (vassoc-ignore-case family cache) (car (setq cache (cons (vector family nil nil t) cache))))) @@ -309,7 +320,7 @@ or if you change your font path, you can (family (and pattern (fc-pattern-get-family pattern 0)))) (if (fc-pattern-get-successp family) - (setq entry (vassoc family (aref dcache 0)))) + (setq entry (vassoc-ignore-case family (aref dcache 0)))) (if (null entry) (make-vector 5 nil) (let ((weight (fc-pattern-get-weight pattern 0)) @@ -338,11 +349,11 @@ or if you change your font path, you can family size weight entry slant) (when (string-match x-font-regexp-foundry-and-family name) (setq family (capitalize (match-string 1 name))) - (setq entry (vassoc family (aref dcache 0)))) + (setq entry (vassoc-ignore-case family (aref dcache 0)))) (when (and (null entry) (string-match x-font-regexp-foundry-and-family truename)) (setq family (capitalize (match-string 1 truename))) - (setq entry (vassoc family (aref dcache 0)))) + (setq entry (vassoc-ignore-case family (aref dcache 0)))) (if (null entry) (make-vector 5 nil) ++++++ bnc502716-xft.patch ++++++ --- lisp/cus-face.el +++ lisp/cus-face.el 2009-06-17 11:35:21.427694043 +0000 @@ -236,19 +236,20 @@ If FRAME is nil, use the default face." (and spec (vector spec) (aref spec 0)))) ;; This consistently fails to dtrt -;;(defun custom-set-face-font-size (face size &optional locale tags) -;; "Set the font of FACE to SIZE." -;; ;; #### should this call have tags in it? -;; (let* ((font (apply 'face-font-name face (list locale))) -;; ;; Gag -;; (fontobj (font-create-object font))) -;; (set-font-size fontobj size) -;; (apply 'font-set-face-font face fontobj locale tags))) - -;; From Jan Vroonhof -- see faces.el (defun custom-set-face-font-size (face size &optional locale tags) "Set the font of FACE to SIZE." - (make-face-size face size locale tags)) + ;; #### should this call have tags in it? + (let* ((font (apply 'face-font-name face (list locale))) + ;; Gag + (fontobj (font-create-object font))) + (make-face-size face size locale tags) + (set-font-size fontobj size) + (apply 'font-set-face-font face fontobj locale tags))) + +;; From Jan Vroonhof -- see faces.el +;;(defun custom-set-face-font-size (face size &optional locale tags) +;; "Set the font of FACE to SIZE." +;; (make-face-size face size locale tags)) (defun custom-face-font-size (face &rest args) "Return the size of the font of FACE as a string." @@ -258,19 +259,20 @@ If FRAME is nil, use the default face." (format "%s" (font-size fontobj)))) ;; Jan suggests this may not dtrt -;;(defun custom-set-face-font-family (face family &optional locale tags) -;; "Set the font of FACE to FAMILY." -;; ;; #### should this call have tags in it? -;; (let* ((font (apply 'face-font-name face (list locale))) -;; ;; Gag -;; (fontobj (font-create-object font))) -;; (set-font-family fontobj family) -;; (apply 'font-set-face-font face fontobj locale tags))) - -;; From Jan Vroonhof -- see faces.el (defun custom-set-face-font-family (face family &optional locale tags) "Set the font of FACE to FAMILY." - (make-face-family face family locale tags)) + ;; #### should this call have tags in it? + (let* ((font (apply 'face-font-name face (list locale))) + ;; Gag + (fontobj (font-create-object font))) + (make-face-family face family locale tags) + (set-font-family fontobj family) + (apply 'font-set-face-font face fontobj locale tags))) + +;; From Jan Vroonhof -- see faces.el +;;(defun custom-set-face-font-family (face family &optional locale tags) +;; "Set the font of FACE to FAMILY." +;; (make-face-family face family locale tags)) (defun custom-face-font-family (face &rest args) "Return the name of the font family of FACE." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org