From be504f26fe4b2bddbebdc8872fbcaf1a6e54c02b8f6cb52c4f2324aba8b5d36d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 24 May 2012 11:54:18 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=79 --- emacs-23.3-xgselect.patch | 14 ++++++++++++++ emacs-23.3.dif | 6 ++++-- emacs.changes | 7 +++++++ emacs.spec | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 emacs-23.3-xgselect.patch diff --git a/emacs-23.3-xgselect.patch b/emacs-23.3-xgselect.patch new file mode 100644 index 0000000..7c7965f --- /dev/null +++ b/emacs-23.3-xgselect.patch @@ -0,0 +1,14 @@ +--- src/xgselect.c ++++ src/xgselect.c 2012-05-24 11:07:45.793270370 +0000 +@@ -60,6 +60,11 @@ xg_select (max_fds, rfds, wfds, efds, ti + xfree (gfds); + gfds = xmalloc (sizeof (*gfds) * gfds_size); + } ++ else if (!gfds) ++ { ++ gfds_size = 1; ++ gfds = xmalloc (sizeof (*gfds)); ++ } + + n_gfds = g_main_context_query (context, + G_PRIORITY_LOW, diff --git a/emacs-23.3.dif b/emacs-23.3.dif index 3d2c7a0..e723e59 100644 --- a/emacs-23.3.dif +++ b/emacs-23.3.dif @@ -678,7 +678,7 @@ :help ,(purecopy "Supply explicit dictionary file name"))) --- site-lisp/term/func-keys.el +++ site-lisp/term/func-keys.el 2003-07-23 16:08:56.000000000 +0000 -@@ -0,0 +1,31 @@ +@@ -0,0 +1,33 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/func-keys.el for site-lisp path +;;; Copyright (c) 1996-2001 SuSE Gmbh Nuernberg, Germany. @@ -707,7 +707,9 @@ +;; +;; Wheel mouse support +;; -+(mouse-wheel-mode 1) ++(if (fboundp 'mouse-wheel-mode) ++ (mouse-wheel-mode 1) ++) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von func-keys.el --- site-lisp/term/gnome.el diff --git a/emacs.changes b/emacs.changes index 3f4e88d..baa3ffc 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 24 11:39:36 UTC 2012 - werner@suse.de + +- Avoid endless loop due multiplying zero with two as this results + also in zero (bnc#763851) ... found in xgselect.c for increasing + the allocated memory used for g_main_context_query(). + ------------------------------------------------------------------- Fri Apr 27 14:27:20 UTC 2012 - ke@suse.de diff --git a/emacs.spec b/emacs.spec index a64810d..709fbf2 100644 --- a/emacs.spec +++ b/emacs.spec @@ -83,6 +83,7 @@ Patch16: emacs-23.1-flyspell.patch Patch18: emacs-sparc.diff Patch22: emacs-23.1-bnc628268.patch Patch23: emacs-23.3-bnc740447.patch +Patch24: emacs-23.3-xgselect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -186,6 +187,7 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then fi %patch22 %patch23 +%patch24 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110