forked from pool/xemacs
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
0949e0e1c3
commit
c47d4e6bde
16
fix-defface-custom-modified-face.patch
Normal file
16
fix-defface-custom-modified-face.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Index: lisp/cus-edit.el
|
||||
===================================================================
|
||||
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cus-edit.el,v
|
||||
retrieving revision 1.24
|
||||
diff -u -r1.24 cus-edit.el
|
||||
--- lisp/cus-edit.el 2007/06/21 13:39:10 1.24
|
||||
+++ lisp/cus-edit.el 2007/08/03 15:45:25
|
||||
@@ -1346,7 +1346,7 @@
|
||||
(defface custom-modified-face '((((class color))
|
||||
(:foreground "white" :background "blue"))
|
||||
(t
|
||||
- (:italic t :bold)))
|
||||
+ (:italic t :bold t)))
|
||||
"Face used when the customize item has been modified."
|
||||
:group 'custom-magic-faces)
|
||||
|
||||
64
w3-xft-problem.patch
Normal file
64
w3-xft-problem.patch
Normal file
@ -0,0 +1,64 @@
|
||||
lisp/ChangeLog addition:
|
||||
|
||||
2007-08-03 Aidan Kehoe <kehoea@parhasard.net>
|
||||
|
||||
* 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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4b5cea0897163c7330d8f626fd45292c5c62974217eb5fbd95053eb40698d48a
|
||||
size 10092834
|
||||
3
xemacs-21.5.28.20070803.tar.bz2
Normal file
3
xemacs-21.5.28.20070803.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5df022e1f106aa2fa64ee1af093a135aee2fb0a54cf5a0aea50c8e1303c9bb3d
|
||||
size 10090401
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 03 15:56:21 CEST 2007 - mfabian@suse.de
|
||||
|
||||
- update to 21.5.28.20070803.
|
||||
- add patch by Aidan Kehoe to make ‘w3’ work in an Xft build
|
||||
(see http://thread.gmane.org/gmane.emacs.xemacs.beta/25191).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 01 15:01:20 CEST 2007 - mfabian@suse.de
|
||||
|
||||
|
||||
31
xemacs.patch
31
xemacs.patch
@ -215,24 +215,6 @@ diff -Nru xemacs-21.5.20.orig/lisp/dumped-lisp.el xemacs-21.5.20/lisp/dumped-lis
|
||||
diff -Nru xemacs-21.5.20.orig/lisp/find-paths.el xemacs-21.5.20/lisp/find-paths.el
|
||||
--- xemacs-21.5.20.orig/lisp/find-paths.el 2005-01-15 16:17:36.000000000 +0100
|
||||
+++ xemacs-21.5.20/lisp/find-paths.el 2005-05-12 14:42:37.000000000 +0200
|
||||
@@ -220,7 +220,7 @@
|
||||
roots
|
||||
(file-name-as-directory
|
||||
(paths-construct-path (list
|
||||
- "lib"
|
||||
+ "share"
|
||||
emacs-program-name)))
|
||||
base
|
||||
envvar default))
|
||||
@@ -267,7 +267,7 @@
|
||||
roots
|
||||
(file-name-as-directory
|
||||
(paths-construct-path
|
||||
- (list "lib"
|
||||
+ (list "share"
|
||||
(construct-emacs-version-name))))
|
||||
base
|
||||
envvar default))
|
||||
@@ -325,7 +325,7 @@
|
||||
|
||||
(defun construct-emacs-version-name ()
|
||||
@ -255,19 +237,6 @@ diff -Nru xemacs-21.5.20.orig/lisp/mule/cyrillic.el xemacs-21.5.20/lisp/mule/cyr
|
||||
|
||||
;; Cyrillic syntax
|
||||
(modify-syntax-entry 'cyrillic-iso8859-5 "w")
|
||||
diff -Nru xemacs-21.5.20.orig/lisp/setup-paths.el xemacs-21.5.20/lisp/setup-paths.el
|
||||
--- xemacs-21.5.20.orig/lisp/setup-paths.el 2004-12-27 13:25:15.000000000 +0100
|
||||
+++ xemacs-21.5.20/lisp/setup-paths.el 2005-05-12 14:38:20.000000000 +0200
|
||||
@@ -256,7 +256,8 @@
|
||||
(paths-uniq-append
|
||||
(append
|
||||
(let ((info-directory
|
||||
- (paths-find-version-directory roots "info"
|
||||
+ (paths-find-version-directory roots
|
||||
+ "info"
|
||||
nil
|
||||
configure-info-directory)))
|
||||
(and info-directory
|
||||
diff -Nru xemacs-21.5.20.orig/lisp/site-init.el xemacs-21.5.20/lisp/site-init.el
|
||||
--- xemacs-21.5.20.orig/lisp/site-init.el 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ xemacs-21.5.20/lisp/site-init.el 2005-05-12 14:38:20.000000000 +0200
|
||||
|
||||
14
xemacs.spec
14
xemacs.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package xemacs (Version 21.5.28.20070730)
|
||||
# spec file for package xemacs (Version 21.5.28.20070803)
|
||||
#
|
||||
# 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.20070730
|
||||
Release: 4
|
||||
Version: 21.5.28.20070803
|
||||
Release: 1
|
||||
Summary: XEmacs
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# Howto get the cvs tree of XEmacs:
|
||||
@ -82,6 +82,8 @@ 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,6 +173,8 @@ Authors:
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
%patch43 -p1
|
||||
%patch44 -p0
|
||||
%patch45 -p0
|
||||
%patch292811 -p1
|
||||
%patch294746 -p1
|
||||
%patch0 -p1
|
||||
@ -567,6 +571,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /usr/share/xemacs/site-packages/lisp/term/
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
(see http://thread.gmane.org/gmane.emacs.xemacs.beta/25191).
|
||||
* Wed Aug 01 2007 - mfabian@suse.de
|
||||
- fix build of xemacs-packages
|
||||
- add missing UTF-8 language environments in site-start.el
|
||||
|
||||
Loading…
Reference in New Issue
Block a user