pool/xemacs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 346546 from M17N

Browse Source 
- Add patch xemacs-21.5.34-alsaplay.patch to wait on pcm handle

- Change encoding order in application defaults of xemacs and
  xemacs-packages to avoid breakdown of FontSet scheme of libX11
  at startup (bsc#952361)

OBS-URL: https://build.opensuse.org/request/show/346546
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2015-11-28 14:19:42 +00:00 committed by Git OBS Bridge
commit c47bece171
6 changed files with 210 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menus-always-utf8.patch
View File

@ -1,7 +1,16 @@
Index: xemacs-21.5.31/lwlib/xlwmenu.c Index: xemacs-21.5.31/lwlib/xlwmenu.c
=================================================================== ===================================================================
--- xemacs-21.5.31.orig/lwlib/xlwmenu.c --- xemacs-21.5.31/lwlib/xlwmenu.c
+++ xemacs-21.5.31/lwlib/xlwmenu.c +++ xemacs-21.5.31/lwlib/xlwmenu.c
@@ -108,7 +108,7 @@ xlwMenuResources[] =
/* We must use an iso8859-1 font here, or people without $LANG set lose.
It's fair to assume that those who do have $LANG set also have the
*fontList resource set, or at least know how to deal with this. */
- XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"),
+ XtRString, (XtPointer) "-*-helvetica-bold-r-*--*-120-*-*-*-*-*-*"),
#else
fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font,
"XtDefaultFont"),
@@ -343,12 +343,12 @@ string_width (XlwMenuWidget mw, @@ -343,12 +343,12 @@ string_width (XlwMenuWidget mw,
#else #else
# ifdef USE_XFONTSET # ifdef USE_XFONTSET
@ -84,3 +93,16 @@ Index: xemacs-21.5.31/lwlib/xlwmenu.c
/* #### should use parent frame's .xftDraw */ /* #### should use parent frame's .xftDraw */
XftDrawDestroy (xftDraw); XftDrawDestroy (xftDraw);
Index: xemacs-21.5.31/src/faces.c
===================================================================
--- xemacs-21.5.31/src/faces.c
+++ xemacs-21.5.31/src/faces.c
@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void)
Fcons
(Fcons
(list1 (device_symbol),
- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
+ build_ascstring ("-*-fixed-medium-r-*--*-120-*-*-*-*-*-*")),
inst_list);
#endif /* !HAVE_XFT */

21
site-start.el
View File

@ -20,7 +20,26 @@
;; Enable mouse wheel support ;; Enable mouse wheel support
;; ;;
(mwheel-install) (when window-system
(mwheel-install))
;; Let gnus save articles in mbox format
(defvar gnus-default-article-saver 'gnus-summary-save-in-file)
;; This system use terminfo
(defvar system-uses-terminfo t)
;; Syntax highlighting
(when (fboundp 'turn-on-lazy-lock)
(require 'font-lock)
;; use lazy-lock by default if lazy-shot is not enabled
(remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
(add-hook 'font-lock-mode-hook
(function
(lambda ()
(unless (and (boundp 'lazy-shot-mode) lazy-shot-mode)
(turn-on-lazy-lock))))
t))
;; ;;
;; i18n setup (encoding, language-environment, ...) ;; i18n setup (encoding, language-environment, ...)

13
xemacs-21.5.34-alsaplay.patch Normal file
View File

@ -0,0 +1,13 @@
--- xemacs-21.5.34/src/alsaplay.c
+++ xemacs-21.5.34/src/alsaplay.c
@@ -375,6 +375,10 @@ alsa_play_sound_data (const Binbyte *dat
if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0)
goto error_mixer;
+ /* Wait for it to finish */
+ if ((err = snd_pcm_drain (pcm_handle)) < 0)
+ goto error_mixer;
+
/* Put the volume back the way it used to be */
reset_volume (&mix);

122
xemacs-app-defaults.patch
View File

@ -1,22 +1,132 @@
Index: xemacs-21.5.29/etc/Emacs.ad Index: xemacs-21.5.29/etc/Emacs.ad
=================================================================== ===================================================================
--- xemacs-21.5.29.orig/etc/Emacs.ad --- xemacs-21.5.29/etc/Emacs.ad
+++ xemacs-21.5.29/etc/Emacs.ad +++ xemacs-21.5.29/etc/Emacs.ad
@@ -41,6 +41,17 @@ @@ -65,6 +65,19 @@
! Note that by default, the pointer foreground and background are the same ! Note that by default, the pointer foreground and background are the same
! as the default face. ! as the default face.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Fonts for Xft: +! Fonts for Xft ONLY:
+XEmacs.Tabs.fcFontName: sans-serif +XEmacs*Tabs.fcFontName: sans-serif
+XEmacs.menubar.fcFontName: sans-serif:size=10 +XEmacs*menubar.fcFontName: sans-serif:size=10
+XEmacs.modeline.attributeFont: sans-serif +XEmacs.modeline.attributeFont: sans-serif
+XEmacs.default.attributeFont: sans-serif +XEmacs.default.attributeFont: sans-serif
+ +
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! FontSet for menus when you use --with-xfs or --with-xim=xlib. +!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
+XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*FontSet -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-helvetica-bold-r-*--*-120-*-*-*-*-iso10646-1, \
+ *
+ +
! Set the menubar colors. This overrides the default foreground and ! Set the menubar colors. This overrides the default foreground and
! background colors specified above. ! background colors specified above.
*menubar*Foreground: Gray30 *menubar*Foreground: Gray30
@@ -222,36 +235,36 @@
! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0
!
-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
- -*-*-*-*-*-*-*-120-*-iso10646-1, \
- -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
-*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
- -*-*-*-*-*-*-*-120-*-iso10646-1, \
- -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+*menubar*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+*popup*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+*menubar*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-*-*-*-*--*-120-*-iso10646-1, \
+ -*-*-*-*-*--*-120-*-jisx0208.1983-0, \
+ -*-*-*-*-*--*-120-*-jisx0201.1976-0
+*popup*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-*-*-*-*--*-120-*-iso10646-1, \
+ -*-*-*-*-*--*-120-*-jisx0208.1983-0, \
+ -*-*-*-*-*--*-120-*-jisx0201.1976-0
! Gui elements share this font
!
-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
!
-*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+*XmDialogShell*FontList: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+*XmTextField*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-*
+*XmText*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-*
+*XmList*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-*
! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font: -*-helvetica-bold-r-*--*-140-*-*-*-*-*-*
! Dialog box translations.
! =======================
Index: xemacs-21.5.29/etc/sample.Xresources
===================================================================
--- xemacs-21.5.29/etc/sample.Xresources
+++ xemacs-21.5.29/etc/sample.Xresources
@@ -238,32 +238,35 @@ XEmacs*toolBarShadowThickness: 2
! There is no harm in having both resources set, except for the confusion
! you suffer. Sorry; that's the price of backward compatibility.
!
-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
- -*-*-*-*-*-*-*-120-*-iso10646-1, \
- -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
-*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
- -*-*-*-*-*-*-*-120-*-iso10646-1, \
- -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+XEmacs*menubar*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+XEmacs*popup*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+XEmacs*FontSet -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-helvetica-bold-r-*--*-120-*-*-*-*-iso10646-1, \
+ *
+XEmacs*menubar*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-*-*-*-*--*-120-*-iso10646-1, \
+ -*-*-*-*-*--*-120-*-jisx0208.1983-0, \
+ -*-*-*-*-*--*-120-*-jisx0201.1976-0
+XEmacs*popup*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \
+ -*-*-*-*-*--*-120-*-iso10646-1, \
+ -*-*-*-*-*--*-120-*-jisx0208.1983-0, \
+ -*-*-*-*-*--*-120-*-jisx0201.1976-0
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
!
-XEmacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-XEmacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-XEmacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-XEmacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+XEmacs*XmDialogShell*FontList: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*
+XEmacs*XmTextField*FontList: -*-courier-medium-r-*--*-120-*-*-*-*-*-*
+XEmacs*XmText*FontList: -*-courier-medium-r-*--*-120-*-*-*-*-*-*
+XEmacs*XmList*FontList: -*-courier-medium-r-*--*-120-*-*-*-*-*-*
! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-XEmacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+XEmacs*Dialog*Font: -*-helvetica-bold-r-*--*-140-*-*-*-*-*-*
! Dialog box translations.
! =======================

12
xemacs.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Nov 27 13:35:03 UTC 2015 - werner@suse.de
- Add patch xemacs-21.5.34-alsaplay.patch to wait on pcm handle
-------------------------------------------------------------------
Fri Nov 27 13:21:20 UTC 2015 - werner@suse.de
- Change encoding order in application defaults of xemacs and
xemacs-packages to avoid breakdown of FontSet scheme of libX11
at startup (bsc#952361)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 13 11:16:32 UTC 2015 - werner@suse.de Mon Jul 13 11:16:32 UTC 2015 - werner@suse.de

45
xemacs.spec
View File

@ -17,6 +17,7 @@
Name: xemacs Name: xemacs
BuildRequires: alsa-lib-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: canna-devel BuildRequires: canna-devel
BuildRequires: compface BuildRequires: compface
@ -93,6 +94,8 @@ Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch
Patch57: xemacs-21.5.34-Xaw3D_I18N.patch Patch57: xemacs-21.5.34-Xaw3D_I18N.patch
# PATCH-FIX-SUSE bsc#932321 # PATCH-FIX-SUSE bsc#932321
Patch58: xemacs-21.5.34-custom-fonts.patch Patch58: xemacs-21.5.34-custom-fonts.patch
# PATCH-FIX-SUSE do wait on alsa
Patch59: xemacs-21.5.34-alsaplay.patch
Requires(pre): permissions Requires(pre): permissions
Requires: ctags Requires: ctags
Requires: efont-unicode Requires: efont-unicode
@ -184,6 +187,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
%patch301352 -p1 %patch301352 -p1
%patch57 -p0 %patch57 -p0
%patch58 -p0 %patch58 -p0
%patch59 -p1
%patch0 -p1 %patch0 -p1
find lisp/ etc/ -name '*.elc' | xargs -r rm -f find lisp/ etc/ -name '*.elc' | xargs -r rm -f
find . -name CVS -type d | xargs rm -rf find . -name CVS -type d | xargs rm -rf
@ -305,12 +309,25 @@ SPECIAL="--with-database=berkdb,gdbm \
%ifnarch s390 %ifnarch s390
--enable-sound=native \ --enable-sound=native \
--with-gpm \ --with-gpm \
%else
--with-sound=nonative,alsa \
%endif %endif
%if %pdump_broken %if %pdump_broken
--without-pdump \ --without-pdump \
%endif %endif
%if ! %enable_xfs "
--with-xft=emacs,menubars,tabs,gauges \ #
# * --with-xfs Compile with XFontSet support for bilingual menubar.
# Can't use this option with --with-xim=motif or xlib.
# And should have --with-menubars=lucid.
# (this is necessary to get German, French, Japanese
# and Romanian texts in the menus.
#
FONTS="\
%if %enable_xfs
--with-xfs \
%else
--with-xft=all \
%endif %endif
" "
# #
@ -324,8 +341,13 @@ X11="--with-xpm \
--with-png \ --with-png \
--with-x \ --with-x \
--with-athena=3d \ --with-athena=3d \
--with-menubars=lucid \
--with-widgets=athena \
--with-dialogs=athena \
--with-scrollbars=lucid \
--x-includes=%{xincludes} \ --x-includes=%{xincludes} \
--x-libraries=%{xlibraries} \ --x-libraries=%{xlibraries} \
--with-xim=xlib \
" "
# #
# Mail # Mail
@ -339,22 +361,7 @@ MAIL="--enable-clash-detection \
# #
# Mule # Mule
# #
# * --with-xfs Compile with XFontSet support for bilingual menubar. MULE="--with-mule"
# Can't use this option with --with-xim=motif or xlib.
# And should have --with-menubars=lucid.
# (this is necessary to get German, French, Japanese
# 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.)
#
MULE="--with-mule \
--with-xim=xlib \
%if %enable_xfs
--with-xfs \
%else
--with-xft \
%endif
"
# #
# Compilation # Compilation
# #
@ -364,7 +371,7 @@ COMP="--with-gcc \
--enable-error-checking=none \ --enable-error-checking=none \
--with-cflags=\"${CFLAGS}\" \ --with-cflags=\"${CFLAGS}\" \
" "
eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $MAIL eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $FONTS $MAIL
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install