pool/xemacs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 123104 from M17N

Browse Source 
- Fix compiler warnings 

- Make /var/lib/xemacs/lock/ optional (bnc#764887) 

- Hard coded attributes for /var/lib/xemacs/lock/

OBS-URL: https://build.opensuse.org/request/show/123104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=67
This commit is contained in:
Stephan Kulow 2012-06-01 20:32:42 +00:00 committed by Git OBS Bridge
commit abf4db494d
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xemacs-21.5.31-array.patch Normal file
View File

@ -0,0 +1,27 @@
--- 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;

15
xemacs.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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/
-------------------------------------------------------------------
Fri May 25 15:00:21 UTC 2012 - werner@suse.de

14
xemacs.spec
View File

@ -41,7 +41,6 @@ BuildRequires: gpm-devel
%else
BuildRequires: gpm
%endif
%define appdefdir /usr/share/X11
%define xbindir /usr/bin
%define xincludes /usr/include
@ -91,11 +90,14 @@ Patch45: fix-defface-custom-modified-face.patch
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 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
%patch51 -p0
%patch52 -p0
%endif
%patch53 -p0
%patch56 -p1
%patch292811 -p1
%patch301352 -p1
@ -379,8 +382,10 @@ set +o posix
#
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 @@ cat xe-list-el-without-elc xe-list-elc-without-el xe-list-elc-with-el \
# 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 @@ rm -rf %{buildroot}
%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)