From 179afc084dac9b0acf607e37b38ef30db1ce18083b1390c8da0b12ce13d3d20d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 3 Nov 2008 13:32:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=37 --- bnc432404-bytecomp.diff | 15 +++++++++++++++ xemacs.changes | 9 +++++++++ xemacs.spec | 22 +++++++++++++++------- 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 bnc432404-bytecomp.diff diff --git a/bnc432404-bytecomp.diff b/bnc432404-bytecomp.diff new file mode 100644 index 0000000..d46aeb0 --- /dev/null +++ b/bnc432404-bytecomp.diff @@ -0,0 +1,15 @@ +diff -ru xemacs-21.5.28.20080401.orig//lisp/bytecomp.el xemacs-21.5.28.20080401/lisp/bytecomp.el +--- xemacs-21.5.28.20080401.orig//lisp/bytecomp.el 2008-04-01 19:40:35.000000000 +0200 ++++ xemacs-21.5.28.20080401/lisp/bytecomp.el 2008-10-29 12:48:15.000000000 +0100 +@@ -1618,7 +1618,10 @@ + (unless byte-compile-overwrite-file + (ignore-file-errors (delete-file target-file))) + (if (file-writable-p target-file) +- (write-region 1 (point-max) target-file) ++ ;; prevent generic hooks from changing our format, eg, ++ ;; latin-unity is known to change the coding system! ++ (let ((write-region-pre-hook nil)) ++ (write-region 1 (point-max) target-file)) + ;; This is just to give a better error message than write-region + (signal 'file-error + (list "Opening output file" diff --git a/xemacs.changes b/xemacs.changes index 76010c0..cff84e9 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Oct 29 12:27:46 CET 2008 - mfabian@suse.de + +- bnc#432404 (XEmacs crashes on loading byte compiled .gnus.elc): + prevent latin-unity from fiddling with the coding system when + byte compiled files are written. Fix from upstream by + Stephen J. Turnbull, see + http://tracker.xemacs.org/XEmacs/its/issue405 + ------------------------------------------------------------------- Wed Aug 20 14:09:28 CEST 2008 - mfabian@suse.de diff --git a/xemacs.spec b/xemacs.spec index b47900e..0dbdd60 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -44,7 +44,7 @@ Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on Version: 21.5.28.20080401 -Release: 43 +Release: 58 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -103,6 +103,7 @@ Patch48: fix-window-configuration-problem.patch Patch49: xemacs-configure.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch +Patch432404: bnc432404-bytecomp.diff %description This is the current version of XEmacs, formerly known as Lucid-Emacs. @@ -197,6 +198,7 @@ Authors: %patch49 %patch292811 -p1 %patch301352 -p1 +%patch432404 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f %ifarch ia64 @@ -599,6 +601,12 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Wed Oct 29 2008 mfabian@suse.de +- bnc#432404 (XEmacs crashes on loading byte compiled .gnus.elc): + prevent latin-unity from fiddling with the coding system when + byte compiled files are written. Fix from upstream by + Stephen J. Turnbull, see + http://tracker.xemacs.org/XEmacs/its/issue405 * Wed Aug 20 2008 mfabian@suse.de - bnc#418055: check coding-system-category before trying to use pefer-coding-system, if coding-system-category is nil the @@ -621,7 +629,7 @@ rm -rf $RPM_BUILD_ROOT destroy the line spacing in the menus. * Wed Mar 12 2008 schwab@suse.de - Fix configure check for Xaw3d. -* Tue Feb 05 2008 mfabian@suse.de +* Mon Feb 04 2008 mfabian@suse.de - bnc#358333: fix bugs in font-lock-add-keywords and font-lock-remove-keywords which caused severe problems when trying to use the kde-emacs lisp files to better support editing @@ -897,7 +905,7 @@ rm -rf $RPM_BUILD_ROOT from xpdf to XEmacs. Patch by Jamie Zawinski, slighly adapted for XEmacs 21.5.18, see also: http://list-archive.xemacs.org/xemacs-beta/200407/msg00158.html -* Mon Feb 14 2005 ro@suse.de +* Sun Feb 13 2005 ro@suse.de - remove .orig file for xemacs-faq * Fri Feb 11 2005 mfabian@suse.de - improve i18n-setup in site-start.el: @@ -940,7 +948,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Sep 28 2004 werner@suse.de, mfabian@suse.de - Bugzilla #45777 (xemacs in metacity can not be maximized). - Bugzilla #46313 (mouse wheel broken in XEmacs). -* Sat Sep 25 2004 mfabian@suse.de +* Fri Sep 24 2004 mfabian@suse.de - Bugzilla #46085: move encoding setup code from func-keys.el to site-start.el and clean it up a bit. site-start.el is *always* read and it is read late enough for the encoding setup, @@ -1229,7 +1237,7 @@ rm -rf $RPM_BUILD_ROOT - remove "xemacs-21.4.4-info.tar.bz2" to save some space in the source rpm (All these info files can be rebuild from the texinfo sources in the main source tar ball "xemacs-21.4.4.tar.bz2") -* Fri Jun 08 2001 werner@suse.de +* Thu Jun 07 2001 werner@suse.de - A long way: Fix trouble with new autoconf * Thu Jun 07 2001 werner@suse.de - Make autoconf work again @@ -1352,7 +1360,7 @@ rm -rf $RPM_BUILD_ROOT - New glibc requires `with system malloc' * Thu Oct 21 1999 werner@suse.de - Last checks -* Thu Oct 21 1999 werner@suse.de +* Wed Oct 20 1999 werner@suse.de - New version 21.1.7 * avoid locale problems due to lisp formats of time e.g. - Use xemacs-mule-sumo-1999-05-27.tar.gz to avoid trouble @@ -1433,7 +1441,7 @@ rm -rf $RPM_BUILD_ROOT - Remove one change of a patch to save choosen fonts in `save options' - Add deadlock keys to x-compose.el and x-iso8859-1.el -* Mon May 26 1997 werner@suse.de +* Sun May 25 1997 werner@suse.de - New version: 19.15 - some changes in keycode under TERM=xterm (term/xterm.el) - info goes to /usr/X11R6/lib/xemacs/info/