Accepting request 207999 from home:AndreasSchwab:f
- emacs-24.3-glibc.patch, emacs-24.3.dif: Remove obsolete hunks - emacs-24.3-xevent.patch: Remove obsolete patch - Remove unknown configure option --without-sync-input OBS-URL: https://build.opensuse.org/request/show/207999 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=132
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
e33d8abb31
commit
ccb517388b
@ -64,14 +64,3 @@
|
||||
|
||||
profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
|
||||
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
|
||||
--- lib-src/etags.c
|
||||
+++ lib-src/etags.c 2013-05-21 14:52:23.881939078 +0000
|
||||
@@ -91,7 +91,7 @@ char pot_etags_version[] = "@(#) pot rev
|
||||
# define NDEBUG /* disable assert */
|
||||
#endif
|
||||
|
||||
-#include <config.h>
|
||||
+#include <../src/config.h>
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE 1 /* enables some compiler checks on GNU */
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
--- src/xmenu.c
|
||||
+++ src/xmenu.c 2013-05-21 15:42:44.917439139 +0000
|
||||
@@ -953,7 +953,7 @@ set_frame_menubar (FRAME_PTR f, bool fir
|
||||
{
|
||||
deep_p = 1;
|
||||
f->output_data.x->saved_menu_event = xmalloc (sizeof (XEvent));
|
||||
- f->output_data.x->saved_menu_event->type = 0;
|
||||
+ memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));
|
||||
}
|
||||
|
||||
#ifdef USE_GTK
|
||||
--- src/xselect.c
|
||||
+++ src/xselect.c 2012-07-03 11:08:10.732010284 +0000
|
||||
@@ -2350,7 +2350,14 @@ x_fill_property_data (Display *dpy, Lisp
|
||||
Lisp_Object o = XCAR (iter);
|
||||
|
||||
if (INTEGERP (o) || FLOATP (o) || CONSP (o))
|
||||
- val = cons_to_signed (o, LONG_MIN, LONG_MAX);
|
||||
+ {
|
||||
+ if (INTEGERP (o) && (XFASTINT (o) > LONG_MAX || XFASTINT (o) < LONG_MIN))
|
||||
+ val = (long) XFASTINT (o);
|
||||
+ else if (FLOATP (o) && (XFLOAT_DATA (o) > LONG_MAX || XFLOAT_DATA (o) < LONG_MIN))
|
||||
+ val = (long) XFLOAT_DATA (o);
|
||||
+ else
|
||||
+ val = cons_to_signed (o, LONG_MIN, LONG_MAX);
|
||||
+ }
|
||||
else if (STRINGP (o))
|
||||
{
|
||||
block_input ();
|
||||
--- src/xterm.c
|
||||
+++ src/xterm.c 2013-05-21 15:44:18.617938988 +0000
|
||||
@@ -5764,9 +5764,11 @@ static struct x_display_info *next_noop_
|
||||
#define SET_SAVED_BUTTON_EVENT \
|
||||
do \
|
||||
{ \
|
||||
- if (f->output_data.x->saved_menu_event == 0) \
|
||||
+ if (f->output_data.x->saved_menu_event == 0) { \
|
||||
f->output_data.x->saved_menu_event = \
|
||||
xmalloc (sizeof (XEvent)); \
|
||||
+ memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent)); \
|
||||
+ } \
|
||||
*f->output_data.x->saved_menu_event = event; \
|
||||
inev.ie.kind = MENU_BAR_ACTIVATE_EVENT; \
|
||||
XSETFRAME (inev.ie.frame_or_window, f); \
|
||||
@ -190,7 +190,7 @@
|
||||
(inferior-scheme-mode)))
|
||||
--- lisp/site-load.el
|
||||
+++ lisp/site-load.el 2013-05-21 15:51:51.649940239 +0000
|
||||
@@ -0,0 +1,61 @@
|
||||
@@ -0,0 +1,41 @@
|
||||
+;;;;
|
||||
+;;; emacs20.xx/lisp/site-load.el
|
||||
+;;; Copyright (c) 1995,96,98,99 SuSE Gmbh Nuernberg, Germany. All rights reserved.
|
||||
@ -213,42 +213,22 @@
|
||||
+;; -DSYSTEM_PURESIZE_EXTRA=25000 -DSITELOAD_PURESIZE_EXTRA=10000"
|
||||
+;;
|
||||
+;; DOC:
|
||||
+;; lisp/emacs-lisp/backquote.elc lisp/disp-table.elc lisp/delsel.elc
|
||||
+;; lisp/lpr.elc added to src/Makefile.in for DOCumentation
|
||||
+;; lisp/delsel.elc lisp/lpr.elc added to src/Makefile.in for DOCumentation
|
||||
+;;
|
||||
+;;;;
|
||||
+(garbage-collect)
|
||||
+
|
||||
+(if (fboundp 'delete-frame)
|
||||
+ (progn
|
||||
+ (load "emacs-lisp/backquote"))
|
||||
+ (garbage-collect))
|
||||
+
|
||||
+(load "disp-table")
|
||||
+(garbage-collect)
|
||||
+
|
||||
+(load "lpr")
|
||||
+(setq lpr-headers-switches (list "-h"))
|
||||
+(setq lpr-add-switches t)
|
||||
+(garbage-collect)
|
||||
+
|
||||
+;; Scrollbar was always on the `right' side
|
||||
+(custom-set-variables '(scroll-bar-mode (quote right)))
|
||||
+(garbage-collect)
|
||||
+
|
||||
+;; Highlight marked regions
|
||||
+(custom-set-variables '(transient-mark-mode 1))
|
||||
+(custom-set-variables '(mark-even-if-inactive t))
|
||||
+(garbage-collect)
|
||||
+
|
||||
+;; Overwrite `load delsel'
|
||||
+;; Choose `t' in your ~/.emacs
|
||||
+(custom-set-variables '(delete-selection-mode nil))
|
||||
+(garbage-collect)
|
||||
+
|
||||
+(setq news-inews-program "/usr/lib/news/inews")
|
||||
+(setq gnus-default-nntp-server "news")
|
||||
+(defvar gnus-local-domain nil)
|
||||
+(garbage-collect)
|
||||
+
|
||||
+;;; site-load.el ends here
|
||||
@ -272,42 +252,6 @@
|
||||
(define-key map "f" 'set-buffer-file-coding-system)
|
||||
(define-key map "r" 'revert-buffer-with-coding-system)
|
||||
(define-key map "F" 'set-file-name-coding-system)
|
||||
--- lisp/mh-e/mh-e.el
|
||||
+++ lisp/mh-e/mh-e.el 2007-05-21 12:27:40.000000000 +0000
|
||||
@@ -137,6 +137,9 @@
|
||||
"/usr/local/mh/"
|
||||
"/usr/bin/mh/" ; Ultrix 4.2, Linux
|
||||
"/usr/new/mh/" ; Ultrix < 4.2
|
||||
+ "/usr/bin/" ; SuSE Linux
|
||||
+ "/etc/nmh/" ; SuSE Linux
|
||||
+ "/usr/lib/nmh/" ; SuSE Linux
|
||||
"/usr/contrib/mh/bin/" ; BSDI
|
||||
"/usr/pkg/bin/" ; NetBSD
|
||||
"/usr/local/bin/"
|
||||
@@ -157,20 +160,20 @@ Use the function `mh-variants' instead."
|
||||
This differs from `mh-variant' when the latter is set to
|
||||
\"autodetect\".")
|
||||
|
||||
-(defvar mh-progs nil
|
||||
+(defvar mh-progs "/usr/bin/"
|
||||
"Directory containing MH commands, such as inc, repl, and rmm.")
|
||||
|
||||
;;;###autoload
|
||||
(put 'mh-progs 'risky-local-variable t)
|
||||
|
||||
-(defvar mh-lib nil
|
||||
+(defvar mh-lib "/etc/nmh/"
|
||||
"Directory containing the MH library.
|
||||
This directory contains, among other things, the components file.")
|
||||
|
||||
;;;###autoload
|
||||
(put 'mh-lib 'risky-local-variable t)
|
||||
|
||||
-(defvar mh-lib-progs nil
|
||||
+(defvar mh-lib-progs "/usr/lib/nmh/"
|
||||
"Directory containing MH helper programs.
|
||||
This directory contains, among other things, the mhl program.")
|
||||
|
||||
--- lisp/net/ange-ftp.el
|
||||
+++ lisp/net/ange-ftp.el 2009-08-12 13:35:06.000000000 +0000
|
||||
@@ -4976,7 +4976,7 @@ NEWNAME should be the name to give the n
|
||||
@ -348,7 +292,7 @@
|
||||
(defun ange-ftp-add-cms-host (host)
|
||||
--- lisp/textmodes/ispell.el
|
||||
+++ lisp/textmodes/ispell.el 2013-05-21 16:06:31.241439612 +0000
|
||||
@@ -351,10 +351,13 @@ Must be greater than 1."
|
||||
@@ -351,10 +351,12 @@ Must be greater than 1."
|
||||
:group 'ispell)
|
||||
|
||||
(defcustom ispell-program-name
|
||||
@ -356,13 +300,12 @@
|
||||
- (executable-find "ispell")
|
||||
- (executable-find "hunspell")
|
||||
- "ispell")
|
||||
+ (progn
|
||||
+ (if (and (functionp 'append-ispell-dict-alist))
|
||||
+ "ispell"
|
||||
+ (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
|
||||
+ (locate-file "ispell" exec-path exec-suffixes 'file-executable-p)
|
||||
+ (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
|
||||
+ "ispell")))
|
||||
+ (if (functionp 'append-ispell-dict-alist)
|
||||
+ "ispell"
|
||||
+ (or (executable-find "aspell")
|
||||
+ (executable-find "ispell")
|
||||
+ (executable-find "hunspell")
|
||||
+ "ispell"))
|
||||
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
|
||||
:type 'string
|
||||
:group 'ispell)
|
||||
@ -743,7 +686,7 @@
|
||||
+;; Ende von linux.el
|
||||
--- site-lisp/term/locale.el
|
||||
+++ site-lisp/term/locale.el 2013-05-21 15:51:52.349939373 +0000
|
||||
@@ -0,0 +1,16 @@
|
||||
@@ -0,0 +1,13 @@
|
||||
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
+;;; term/locale.el for site-lisp path
|
||||
+;;; Copyright (c) 1996-2003 SuSE Linux AG Nuernberg, Germany.
|
||||
@ -754,9 +697,6 @@
|
||||
+
|
||||
+(add-hook 'term-setup-hook (function (lambda ()
|
||||
+ (load "term/func-keys" t t))))
|
||||
+;; Nowadays
|
||||
+(if window-system
|
||||
+ (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT STRING TEXT)))
|
||||
+;;
|
||||
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
+;; Ende von locale.el
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 22 20:38:08 UTC 2013 - schwab@linux-m68k.org
|
||||
|
||||
- emacs-24.3-glibc.patch, emacs-24.3.dif: Remove obsolete hunks
|
||||
- emacs-24.3-xevent.patch: Remove obsolete patch
|
||||
- Remove unknown configure option --without-sync-input
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 11 12:30:07 UTC 2013 - boris@steki.net
|
||||
|
||||
|
||||
@ -101,7 +101,6 @@ Patch12: emacs-24.3-x11r7.patch
|
||||
Patch15: emacs-24.3-iconic.patch
|
||||
Patch16: emacs-24.3-flyspell.patch
|
||||
Patch22: emacs-24.1-bnc628268.patch
|
||||
Patch23: emacs-24.3-xevent.patch
|
||||
Patch25: emacs-24.3-giflib5.patch
|
||||
Patch26: emacs-24.3-nntp-typhoon-fix.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -215,7 +214,6 @@ and most assembler-like syntaxes.
|
||||
%patch16 -p0 -b .flyspell
|
||||
%patch -p0
|
||||
%patch22 -p0
|
||||
%patch23 -p0
|
||||
%patch25 -p0
|
||||
%patch26 -p1
|
||||
|
||||
@ -345,7 +343,6 @@ DESKTOP="--with-x \
|
||||
NOX11="--with-gpm \
|
||||
--without-x \
|
||||
--without-sound \
|
||||
--without-sync-input \
|
||||
--without-xpm \
|
||||
--without-jpeg \
|
||||
--without-tiff \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user