Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2012-07-23 09:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2012-06-28 17:24:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2012-07-23 10:15:30.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 20 10:54:15 UTC 2012 - [email protected] + +- xorg-x11-libs is not in default installation anymore, use libX11-6 + to be enhanced by emacs-x11 + +------------------------------------------------------------------- +Tue Jul 3 12:25:05 UTC 2012 - [email protected] + +- Don't be fooled by not initialized time stamps of unused XEvent + structures which happens with old GTK-2.0 + +------------------------------------------------------------------- +Fri Jun 29 15:22:42 UTC 2012 - [email protected] + +- make it build even for older distries + +------------------------------------------------------------------- New: ---- emacs-24.1-configure.patch emacs-24.1-xevent.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.ruKZu0/_old 2012-07-23 10:15:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ruKZu0/_new 2012-07-23 10:15:32.000000000 +0200 @@ -77,6 +77,7 @@ Source4: emacs-rpmlintrc Source5: emacs.desktop Patch: emacs-24.1.dif +Patch1: emacs-24.1-configure.patch Patch2: emacs-24.1-glibc.patch Patch3: emacs-24.1-decl.dif Patch4: emacs-23.1-asian-print.patch @@ -92,6 +93,7 @@ Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch Patch22: emacs-24.1-bnc628268.patch +Patch23: emacs-24.1-xevent.patch Patch24: emacs-24.1-xgselect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 @@ -135,7 +137,7 @@ PreReq: fileutils Requires: emacs = %{version}-%{release} Provides: emacs_program = %{version}-%{release} -Enhances: xorg-x11-libs +Enhances: libX11-6 Summary: GNU Emacs: Emacs binary with X Window System Support Group: Productivity/Editors/Emacs @@ -195,7 +197,11 @@ install-mh -auto < /dev/null fi %patch22 +%patch23 %patch24 +%if 0%{?suse_version} < 1130 +%patch1 +%endif # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110 @@ -292,7 +298,11 @@ --without-gpm \ " GTK="${DESKTOP} \ +%if 0%{?suse_version} > 1130 --with-x-toolkit=gtk3 \ +%else + --with-x-toolkit=gtk \ +%endif --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}:%{_x11data} \ --with-xft \ @@ -348,7 +358,9 @@ export MALLOC_CHECK_ fi } +%if 0%{?suse_version} >= 1130 autoconf +%endif CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} make_mchkoff bootstrap make -C lisp updates compile ++++++ emacs-24.1-configure.patch ++++++ ++++ 1034 lines (skipped) ++++++ emacs-24.1-xevent.patch ++++++ --- src/xmenu.c +++ src/xmenu.c 2012-07-03 11:51:37.448009822 +0000 @@ -964,7 +964,7 @@ set_frame_menubar (FRAME_PTR f, int firs { deep_p = 1; f->output_data.x->saved_menu_event = (XEvent*)xmalloc (sizeof (XEvent)); - f->output_data.x->saved_menu_event->type = 0; + memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent)); } #ifdef USE_GTK --- src/xselect.c +++ src/xselect.c 2012-07-03 11:08:10.732010284 +0000 @@ -2344,7 +2344,14 @@ x_fill_property_data (Display *dpy, Lisp Lisp_Object o = XCAR (iter); if (INTEGERP (o) || FLOATP (o) || CONSP (o)) - val = cons_to_signed (o, LONG_MIN, LONG_MAX); + { + if (INTEGERP (o) && (XFASTINT (o) > LONG_MAX || XFASTINT (o) < LONG_MIN)) + val = (long) XFASTINT (o); + else if (FLOATP (o) && (XFLOAT_DATA (o) > LONG_MAX || XFLOAT_DATA (o) < LONG_MIN)) + val = (long) XFLOAT_DATA (o); + else + val = cons_to_signed (o, LONG_MIN, LONG_MAX); + } else if (STRINGP (o)) { BLOCK_INPUT; --- src/xterm.c +++ src/xterm.c 2012-07-03 11:47:12.060510503 +0000 @@ -5753,9 +5753,10 @@ static struct x_display_info *next_noop_ #define SET_SAVED_BUTTON_EVENT \ do \ { \ - if (f->output_data.x->saved_menu_event == 0) \ + if (f->output_data.x->saved_menu_event == 0) { \ f->output_data.x->saved_menu_event \ = (XEvent *) xmalloc (sizeof (XEvent)); \ + memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));}\ *f->output_data.x->saved_menu_event = event; \ inev.ie.kind = MENU_BAR_ACTIVATE_EVENT; \ XSETFRAME (inev.ie.frame_or_window, f); \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
