.
OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=87
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
504412f5b3
commit
8cedfd6005
@ -1,7 +1,16 @@
|
||||
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
|
||||
@@ -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,
|
||||
#else
|
||||
# ifdef USE_XFONTSET
|
||||
@ -84,3 +93,16 @@ Index: xemacs-21.5.31/lwlib/xlwmenu.c
|
||||
|
||||
/* #### should use parent frame's .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 */
|
||||
|
||||
13
xemacs-21.5.34-alsaplay.patch
Normal file
13
xemacs-21.5.34-alsaplay.patch
Normal 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);
|
||||
|
||||
@ -1,22 +1,77 @@
|
||||
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
|
||||
@@ -41,6 +41,17 @@
|
||||
@@ -65,6 +65,19 @@
|
||||
! Note that by default, the pointer foreground and background are the same
|
||||
! as the default face.
|
||||
|
||||
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
+! Fonts for Xft:
|
||||
+XEmacs.Tabs.fcFontName: sans-serif
|
||||
+XEmacs.menubar.fcFontName: sans-serif:size=10
|
||||
+! Fonts for Xft ONLY:
|
||||
+XEmacs*Tabs.fcFontName: sans-serif
|
||||
+XEmacs*menubar.fcFontName: sans-serif:size=10
|
||||
+XEmacs.modeline.attributeFont: sans-serif
|
||||
+XEmacs.default.attributeFont: sans-serif
|
||||
+
|
||||
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
+!! 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
|
||||
! background colors specified above.
|
||||
*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.
|
||||
! =======================
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
44
xemacs.spec
44
xemacs.spec
@ -93,6 +93,8 @@ Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch
|
||||
Patch57: xemacs-21.5.34-Xaw3D_I18N.patch
|
||||
# PATCH-FIX-SUSE bsc#932321
|
||||
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: ctags
|
||||
Requires: efont-unicode
|
||||
@ -184,6 +186,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
|
||||
%patch301352 -p1
|
||||
%patch57 -p0
|
||||
%patch58 -p0
|
||||
%patch59 -p1
|
||||
%patch0 -p1
|
||||
find lisp/ etc/ -name '*.elc' | xargs -r rm -f
|
||||
find . -name CVS -type d | xargs rm -rf
|
||||
@ -305,12 +308,25 @@ SPECIAL="--with-database=berkdb,gdbm \
|
||||
%ifnarch s390
|
||||
--enable-sound=native \
|
||||
--with-gpm \
|
||||
%else
|
||||
--with-sound=nonative,alsa \
|
||||
%endif
|
||||
%if %pdump_broken
|
||||
--without-pdump \
|
||||
%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
|
||||
"
|
||||
#
|
||||
@ -324,8 +340,13 @@ X11="--with-xpm \
|
||||
--with-png \
|
||||
--with-x \
|
||||
--with-athena=3d \
|
||||
--with-menubars=lucid \
|
||||
--with-widgets=athena \
|
||||
--with-dialogs=athena \
|
||||
--with-scrollbars=lucid \
|
||||
--x-includes=%{xincludes} \
|
||||
--x-libraries=%{xlibraries} \
|
||||
--with-xim=xlib \
|
||||
"
|
||||
#
|
||||
# Mail
|
||||
@ -339,22 +360,7 @@ MAIL="--enable-clash-detection \
|
||||
#
|
||||
# Mule
|
||||
#
|
||||
# * --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. 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
|
||||
"
|
||||
MULE="--with-mule"
|
||||
#
|
||||
# Compilation
|
||||
#
|
||||
@ -364,7 +370,7 @@ COMP="--with-gcc \
|
||||
--enable-error-checking=none \
|
||||
--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}
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user