commit xemacs for openSUSE:Factory
Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2012-06-01 22:32:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xemacs", Maintainer is "werner@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2012-05-26 13:04:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2012-06-01 22:32:54.000000000 +0200 @@ -1,0 +2,15 @@ +Thu May 31 15:30:38 UTC 2012 - werner@suse.de + +- Fix compiler warnings + +------------------------------------------------------------------- +Thu May 31 14:51:02 UTC 2012 - werner@suse.de + +- Make /var/lib/xemacs/lock/ optional (bnc#764887) + +------------------------------------------------------------------- +Wed May 30 10:58:22 UTC 2012 - werner@suse.de + +- Hard coded attributes for /var/lib/xemacs/lock/ + +------------------------------------------------------------------- New: ---- xemacs-21.5.31-array.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.fsRwiL/_old 2012-06-01 22:32:56.000000000 +0200 +++ /var/tmp/diff_new_pack.fsRwiL/_new 2012-06-01 22:32:56.000000000 +0200 @@ -41,7 +41,6 @@ %else BuildRequires: gpm %endif - %define appdefdir /usr/share/X11 %define xbindir /usr/bin %define xincludes /usr/include @@ -91,11 +90,14 @@ Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch +Patch53: xemacs-21.5.31-array.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch %define _default_patch_fuzz 2 +%bcond_with lock + %description This is the current version of XEmacs, formerly known as Lucid-Emacs. It is related to other versions of Emacs, in particular GNU Emacs. Its @@ -167,6 +169,7 @@ %patch51 -p0 %patch52 -p0 %endif +%patch53 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1 @@ -379,8 +382,10 @@ # mkdir -p %{buildroot}/usr/share/xemacs/site-lisp/lisp mkdir -p %{buildroot}/usr/share/xemacs/site-packages/lisp/term +%if %{with lock} mkdir -p %{buildroot}/var/lib/xemacs/lock chmod 1777 %{buildroot}/var/lib/xemacs/lock +%endif make DESTDIR=%{buildroot} install mv %{buildroot}%{xbindir}/xemacs-21.?-??? %{buildroot}%{xbindir}/xemacs # fix up the load-history to make it possible to use find-function @@ -528,15 +533,18 @@ # packages: rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/ +%if %{with lock} %if %{defined verify_permissions} %verifyscript %verify_permissions -e /var/lib/xemacs/lock %endif %if %{defined set_permissions} + %post %set_permissions /var/lib/xemacs/lock %endif +%endif %clean rm -rf %{buildroot} @@ -605,8 +613,10 @@ %dir /usr/share/xemacs/site-packages/lisp/term/ %dir /usr/share/xemacs/site-lisp/ %dir /usr/share/xemacs/site-lisp/lisp/ +%if %{with lock} %dir /var/lib/xemacs/ -%dir %verify(not mode group) %attr(-,root,trusted) /var/lib/xemacs/lock/ +%dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/ +%endif %files -n xemacs-info %defattr(-,root,root) ++++++ xemacs-21.5.31-array.patch ++++++ --- src/events.c +++ src/events.c 2012-05-31 15:13:06.832009873 +0000 @@ -1611,8 +1611,11 @@ upshift_event (Lisp_Object event) XSET_EVENT_KEY_KEYSYM (event, make_char (c + 'A' - 'a')); else if (!(XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_SHIFT)) - XSET_EVENT_KEY_MODIFIERS - (event, XEVENT_KEY_MODIFIERS (event) |= XEMACS_MOD_SHIFT); + { + Lisp_Object tmp = XEVENT_KEY_MODIFIERS (event); + tmp |= XEMACS_MOD_SHIFT; + XSET_EVENT_KEY_MODIFIERS (event, tmp); + } } 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; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de