rpm/xemacs
SHA256
1
0
Fork 0
forked from pool/xemacs
Code Pull Requests Activity

Accepting request 130343 from home:ailin_nemui:branches:M17N:back

Browse Source 
I see, please have a look at this then

OBS-URL: https://build.opensuse.org/request/show/130343
OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=54
This commit is contained in:
Marguerite Su 2012-08-08 01:28:16 +00:00 committed by Git OBS Bridge
parent 84a8757fe0
commit c904c531e6
7 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bugzilla-301352-fix-wrong-incrementing-in-macros.patch
View File

@ -6,8 +6,8 @@ Index: xemacs-21.5.29/src/mule-ccl.c
Lisp_Object map, content, attrib, value; Lisp_Object map, content, attrib, value;
int point, size, fin_ic; int point, size, fin_ic;
- j = XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps. */ - j = XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* number of maps. */
+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps. */ + j = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* number of maps. */
fin_ic = ic + j; fin_ic = ic + j;
op = reg[rrr]; op = reg[rrr];
if ((j > reg[RRR]) && (j >= 0)) if ((j > reg[RRR]) && (j >= 0))
@ -15,8 +15,8 @@ Index: xemacs-21.5.29/src/mule-ccl.c
for (;i < j;i++) for (;i < j;i++)
{ {
size = XVECTOR (Vcode_conversion_map_vector)->size; size = XVECTOR (Vcode_conversion_map_vector)->size;
- point = XCHAR_OR_INT (ccl_prog[ic++]); - point = XCHAR_OR_FIXNUM (ccl_prog[ic++]);
+ point = XCHAR_OR_INT (ccl_prog[ic]); ic++; + point = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++;
if (point >= size) continue; if (point >= size) continue;
map = map =
XVECTOR (Vcode_conversion_map_vector)->contents[point]; XVECTOR (Vcode_conversion_map_vector)->contents[point];
@ -24,8 +24,8 @@ Index: xemacs-21.5.29/src/mule-ccl.c
stack_idx_of_map_multiple = 0; stack_idx_of_map_multiple = 0;
map_set_rest_length = map_set_rest_length =
- XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps and separators. */ - XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* number of maps and separators. */
+ XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps and separators. */ + XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* number of maps and separators. */
fin_ic = ic + map_set_rest_length; fin_ic = ic + map_set_rest_length;
op = reg[rrr]; op = reg[rrr];
@ -33,8 +33,8 @@ Index: xemacs-21.5.29/src/mule-ccl.c
{ {
Lisp_Object map, attrib, value, content; Lisp_Object map, attrib, value, content;
int size, point; int size, point;
- j = XCHAR_OR_INT (ccl_prog[ic++]); /* map_id */ - j = XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* map_id */
+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* map_id */ + j = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* map_id */
op = reg[rrr]; op = reg[rrr];
if (j >= XVECTOR (Vcode_conversion_map_vector)->size) if (j >= XVECTOR (Vcode_conversion_map_vector)->size)
{ {

9
xemacs-21.4.8-xevent.patch
View File

@ -2,20 +2,17 @@ Index: src/event-Xt.c
=================================================================== ===================================================================
--- src/event-Xt.c.orig --- src/event-Xt.c.orig
+++ src/event-Xt.c +++ src/event-Xt.c
@@ -1224,9 +1224,13 @@ x_event_to_emacs_event (XEvent *x_event, @@ -1224,8 +1224,11 @@ x_event_to_emacs_event (XEvent *x_event,
if (modifiers & XEMACS_MOD_SHIFT) if (modifiers & XEMACS_MOD_SHIFT)
{ {
- int Mode_switch_p = *state & xd->ModeMask; - int Mode_switch_p = *state & xd->ModeMask;
- KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0); - KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0);
- KeySym top = XLookupKeysym (ev, Mode_switch_p ? 3 : 1); + KeySym bot;
+ KeySym top, bot;
+ XKeyEvent tmpev = *ev; + XKeyEvent tmpev = *ev;
+ +
+ tmpev.state = *state & (xd->ModeMask | ~0xff); + tmpev.state = *state & (xd->ModeMask | ~0xff);
+ XLookupString(&tmpev, NULL, 0, &bot, NULL); + XLookupString(&tmpev, NULL, 0, &bot, NULL);
+ tmpev.state |= ShiftMask; if (x_keysym && bot && x_keysym != bot)
+ XLookupString(&tmpev, NULL, 0, &top, NULL);
if (top && bot && top != bot)
modifiers &= ~XEMACS_MOD_SHIFT; modifiers &= ~XEMACS_MOD_SHIFT;
} }

3
xemacs-21.5.31.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d
size 15802193

3
xemacs-21.5.32.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e2b7bfffac365ba563914e56faa40ec75199deff337715732a489a23f061828
size 12359653

4
xemacs-level3.patch
View File

@ -23,9 +23,9 @@ Index: xemacs-21.5.29/src/event-Xt.c
return 0; return 0;
} }
@@ -872,8 +881,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve @@ -872,8 +881,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve
than passing in 0) to avoid crashes on German IRIX */
char dummy[256]; char dummy[256];
XLookupString (event, dummy, 200, &keysym, 0); XLookupString (event, dummy, 200, &keysym, 0);
*x_keysym_out = keysym;
- return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - return (IsModifierKey (keysym) || keysym == XK_Mode_switch )
- ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p);
+ return (IsModifierKey (keysym) + return (IsModifierKey (keysym)
@ -43,9 +43,9 @@ Index: xemacs-21.5.29/src/event-Xt.c
#endif /* ! XIM_MOTIF */ #endif /* ! XIM_MOTIF */
@@ -932,8 +950,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve @@ -932,8 +950,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve
{
case XLookupKeySym: case XLookupKeySym:
case XLookupBoth: case XLookupBoth:
*x_keysym_out = keysym;
- return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - return (IsModifierKey (keysym) || keysym == XK_Mode_switch )
- ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p);
+ return (IsModifierKey (keysym) + return (IsModifierKey (keysym)

10
xemacs.patch
View File

@ -268,18 +268,18 @@ Index: xemacs-21.5.29/lisp/x-win-xfree86.el
=================================================================== ===================================================================
--- xemacs-21.5.29.orig/lisp/x-win-xfree86.el --- xemacs-21.5.29.orig/lisp/x-win-xfree86.el
+++ xemacs-21.5.29/lisp/x-win-xfree86.el +++ xemacs-21.5.29/lisp/x-win-xfree86.el
@@ -101,6 +101,10 @@ @@ -99,6 +99,11 @@
;; define also the control, meta, and meta-control versions. ;; define also the control, meta, and meta-control versions.
(loop for mods in '(() (control) (meta) (meta control)) do (loop for mods in '(() (control) (meta) (meta control)) do
(define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) (define-key function-key-map `[(,@mods ,key)]
- )))) - `[(shift ,@mods ,sane-key)])))))
- + `[(shift ,@mods ,sane-key)]))))
+ )))
+;; Begin insert +;; Begin insert
+;; <werner@suse.de> set Symbol delete == [delete] to delete-char +;; <werner@suse.de> set Symbol delete == [delete] to delete-char
+ (load "term/func-keys" t t) + (load "term/func-keys" t t)
+;; End insert +;; End insert
+) +)
;;; x-win-xfree86.el ends here ;;; x-win-xfree86.el ends here
Index: xemacs-21.5.29/site-packages/lisp/term/func-keys.el Index: xemacs-21.5.29/site-packages/lisp/term/func-keys.el
=================================================================== ===================================================================

29
xemacs.spec
View File

@ -45,7 +45,7 @@ BuildRequires: gpm
%define xbindir /usr/bin %define xbindir /usr/bin
%define xincludes /usr/include %define xincludes /usr/include
%define xlibraries /usr/%{_lib} %define xlibraries /usr/%{_lib}
%define _id b604d235f028 %define _id 900a0a8796c3
%define _hg beta-%{_id} %define _hg beta-%{_id}
Url: http://www.xemacs.org Url: http://www.xemacs.org
PreReq: permissions PreReq: permissions
@ -53,10 +53,10 @@ Requires: ctags
Requires: xemacs-info Requires: xemacs-info
Requires: xemacs-packages Requires: xemacs-packages
Conflicts: gnuserv Conflicts: gnuserv
Version: 21.5.31 Version: 21.5.32
Release: 0 Release: 0
Summary: XEmacs Summary: XEmacs
License: GPL-2.0+ License: GPL-3.0+
Group: Productivity/Editors/Emacs Group: Productivity/Editors/Emacs
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Howto get the Mercurial tree of XEmacs: # Howto get the Mercurial tree of XEmacs:
@ -65,7 +65,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
# delete the .hg directory before creating the tarball in order # delete the .hg directory before creating the tarball in order
# not to make the source rpm huge. # not to make the source rpm huge.
Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/xemacs-21.5.31.tar.gz Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/xemacs-%version.tar.gz
Source1: xe-list.el Source1: xe-list.el
Source2: fix-load-history.el Source2: fix-load-history.el
Source3: xemacs.desktop Source3: xemacs.desktop
@ -151,11 +151,11 @@ echo Use xft, requires X11, Xft, Xrender, freetype, and fontconfig support.
%else %else
echo Use xfs, that is XFontSet support for internationalized menubar. echo Use xfs, that is XFontSet support for internationalized menubar.
%endif %endif
%setup -q %setup -q -n xemacs-xemacs-%_id
%patch3 -p1 %patch3 -p1
%patch18 -p0 -b .xevent %patch18 -p0 -b .xevent
%patch20 -p1 %patch20 -p1
%patch22 -p0 #%patch22 -p0
%patch23 -p1 %patch23 -p1
%patch27 -p1 -b .lvl3 %patch27 -p1 -b .lvl3
%patch28 -p1 -b .movemail %patch28 -p1 -b .movemail
@ -251,7 +251,7 @@ LIBEXEC=${LIB}/xemacs/${VERSION}
# this prints the Xresources used for the Menus to stdout # this prints the Xresources used for the Menus to stdout
# when the Menus are used. # when the Menus are used.
LDFLAGS= LDFLAGS=
export CFLAGS LDFLAGS ## export CFLAGS LDFLAGS
# #
# Maybe there are emacs and xemacs on the # Maybe there are emacs and xemacs on the
# same system, therefore put binaries into /usr/X11R6/bin # same system, therefore put binaries into /usr/X11R6/bin
@ -291,6 +291,7 @@ SPECIAL="--with-database=berkdb,gdbm \
--with-canna \ --with-canna \
--with-tty=yes \ --with-tty=yes \
--with-site-lisp \ --with-site-lisp \
%if 0
%ifarch ia64 ppc ppc64 s390x s390 %ix86 x86_64 %arm %ifarch ia64 ppc ppc64 s390x s390 %ix86 x86_64 %arm
--disable-mc-alloc \ --disable-mc-alloc \
--disable-kkcc \ --disable-kkcc \
@ -300,6 +301,7 @@ SPECIAL="--with-database=berkdb,gdbm \
--with-kkcc \ --with-kkcc \
--with-newgc \ --with-newgc \
%endif %endif
%endif
%ifnarch s390 %ifnarch s390
--enable-sound=native \ --enable-sound=native \
--with-gpm \ --with-gpm \
@ -309,11 +311,15 @@ SPECIAL="--with-database=berkdb,gdbm \
%if %enable_dump_in_exec %if %enable_dump_in_exec
--enable-dump-in-exec \ --enable-dump-in-exec \
%else %else
%if 0
--disable-dump-in-exec \ --disable-dump-in-exec \
%endif %endif
%endif
%else %else
%if 0
--enable-pdump=no \ --enable-pdump=no \
%endif %endif
%endif
%if ! %enable_xfs %if ! %enable_xfs
--with-xft=emacs,menubars,tabs,gauges \ --with-xft=emacs,menubars,tabs,gauges \
%endif %endif
@ -356,7 +362,7 @@ MAIL="--enable-clash-detection \
# --with-xim=xlib, the above comment from './configure --help' # --with-xim=xlib, the above comment from './configure --help'
# seems to be incorrect in that respect.) # seems to be incorrect in that respect.)
# #
MULE="--enable-mule \ MULE="--with-mule \
--with-xim=xlib \ --with-xim=xlib \
%if %enable_xfs %if %enable_xfs
--with-xfs \ --with-xfs \
@ -367,12 +373,17 @@ MULE="--enable-mule \
# #
# Compilation # Compilation
# #
COMP="--with-gcc \ ##--with-gcc \
COMP=" \
--with-dynamic \ --with-dynamic \
--with-debug \ --with-debug \
--enable-error-checking=none \ --enable-error-checking=none \
%if 0
--with-cflags=\"${CFLAGS}\" \ --with-cflags=\"${CFLAGS}\" \
--with-ldflags=\"${LDFLAGS}\" \ --with-ldflags=\"${LDFLAGS}\" \
%else
--with-cflags=\"${RPM_OPT_FLAGS}\" \
%endif
" "
eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $MAIL eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $MAIL
make %{?jobs:-j %jobs} make %{?jobs:-j %jobs}