From c41ddf89e5897f90ba45b2a15ba0efddbde920ba59d692d57e26ea943166b3ef Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 23 Jul 2013 09:40:51 +0000 Subject: [PATCH] Accepting request 184061 from home:ailin_nemui:branches:M17N:back bug fix for bnc#830221 OBS-URL: https://build.opensuse.org/request/show/184061 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=66 --- xemacs-21.5.31-array.patch | 11 ----------- xemacs.changes | 6 ++++++ xemacs.spec | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/xemacs-21.5.31-array.patch b/xemacs-21.5.31-array.patch index 1d4769d..74c7fd0 100644 --- a/xemacs-21.5.31-array.patch +++ b/xemacs-21.5.31-array.patch @@ -14,14 +14,3 @@ } void ---- src/mule-wnnfns.c -+++ src/mule-wnnfns.c 2012-05-31 15:27:10.952509987 +0000 -@@ -2117,7 +2117,7 @@ yes_or_no (UExtbyte *s) - c2m (s, mbuf, charset); - /* truncate "(Y/N)" */ - for (len = 0; (mbuf[len]) && (len < 512); len++); -- for (; (mbuf[len] != '(') && (len > 0); len--); -+ for (len--; (mbuf[len] != '(') && (len >= 0); len--); - { - Lisp_Object yes, str; - struct gcpro gcpro1; diff --git a/xemacs.changes b/xemacs.changes index 96146c1..690ba31 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 23 08:59:47 UTC 2013 - ailin.nemui@gmail.com + +- remove incorrect patch which breaks XEmacs/wnn introduced by + request 123104 (fix crashbug bnc#830221) + ------------------------------------------------------------------- Sun Jan 6 15:25:50 UTC 2013 - ailin.nemui@gmail.com diff --git a/xemacs.spec b/xemacs.spec index 7c0ff07..a7bb156 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -41,6 +41,8 @@ BuildRequires: gpm-devel %else BuildRequires: gpm %endif +%define _id bee2e2568828 +%define _hg hg%{_id} Version: 21.5.33 Release: 0 Summary: XEmacs @@ -50,8 +52,6 @@ Group: Productivity/Editors/Emacs %define xbindir /usr/bin %define xincludes /usr/include %define xlibraries /usr/%{_lib} -%define _id bee2e2568828 -%define _hg beta-%{_id} Url: http://www.xemacs.org # Howto get the Mercurial tree of XEmacs: # See: http://xemacs.digimirror.nl/Develop/hgaccess.html