Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2012-03-05 18:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xemacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2012-02-10 17:20:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2012-03-05 18:02:52.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 2 16:34:50 UTC 2012 - [email protected] + +- Update to beta version XEmacs 21.5.31 "ginger" + * this includes 138 fixes including 9 crashes + * this includes 110 improvments + * also include some of our own patches + +------------------------------------------------------------------- Old: ---- bnc558764_avoid-xft-if-absent.patch bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch build-fix-ccl-load-problem.patch changeset-dec62ca5a899.patch gnomebug.patch ndbm.patch suppress-warning-about-undefined-unicode-key-mappings.patch unitialized-variables.patch xemacs-21.4.13-ppc.patch xemacs-21.4.4-font-menu.patch xemacs-beta-b604d235f028.tar.bz2 xemacs-ia64.dif New: ---- xemacs-21.5.31.tar.gz xemacs-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: xemacs BuildRequires: autoconf BuildRequires: canna-devel @@ -52,7 +53,7 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv -Version: 21.5.29.b604d235f028 +Version: 21.5.31 Release: 0 Summary: XEmacs License: GPL-2.0+ @@ -64,7 +65,7 @@ # # delete the .hg directory before creating the tarball in order # not to make the source rpm huge. -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{_hg}.tar.bz2 +Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/xemacs-21.5.31.tar.gz Source1: xe-list.el Source2: fix-load-history.el Source3: xemacs.desktop @@ -75,33 +76,20 @@ Patch0: xemacs.patch # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package: Patch3: xemacs-app-defaults.patch -Patch5: xemacs-21.4.4-font-menu.patch -Patch13: xemacs-ia64.dif -Patch14: ndbm.patch Patch18: xemacs-21.4.8-xevent.patch -Patch19: xemacs-21.4.13-ppc.patch Patch20: xemacs-21.4.13-ppc64.patch Patch22: destdir.patch Patch23: xemacs-ptmx.dif -Patch25: gnomebug.patch Patch27: xemacs-level3.patch Patch28: xemacs-21.5.18-movemail.patch Patch32: do-not-create-backups-in-temp-directories.patch Patch33: set-locale-to-c-when-not-supported-by-x.patch -Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch -Patch38: unitialized-variables.patch Patch39: xemacs-tinfo.dif -Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch -Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch -Patch54: bnc558764_avoid-xft-if-absent.patch -Patch55: changeset-dec62ca5a899.patch -# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- [email protected]; build with libpng15; didn't sent to upstream -# build against libpng14 should not be affected, otherwise please let me know 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 @@ -160,29 +148,17 @@ %else echo Use xfs, that is XFontSet support for internationalized menubar. %endif -%setup -q -n xemacs-%{_hg} +%setup -q %patch3 -p1 -#%patch5 -p1 -b .fontmenu # appears to be not needed anymore -#%patch13 -p1 -%patch14 -p1 %patch18 -p0 -b .xevent -%patch19 -p1 -b .ppc %patch20 -p1 -%patch22 -p1 +%patch22 -p0 %patch23 -p1 -#%patch24 -p1 -#triggers #103040 -#%patch25 -p1 %patch27 -p1 -b .lvl3 %patch28 -p1 -b .movemail %patch32 -p1 %patch33 -p1 -#%patch34 -p1 -%patch38 -p1 %patch39 -p0 -#%patch40 -p1 -#%patch41 -p1 -#%patch42 -p1 %patch43 -p1 %patch45 -p0 %patch50 -p1 @@ -190,8 +166,6 @@ %patch51 -p0 %patch52 -p0 %endif -%patch54 -p0 -%patch55 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1 @@ -308,7 +282,7 @@ # when using "--rel-alloc, XEmacs 21.5.18 crashes often when using # 'compile-goto-error'. # --rel-alloc \ -SPECIAL="--enable-database=berkdb,gdbm \ +SPECIAL="--with-database=berkdb,gdbm \ --with-ncurses \ --with-canna \ --with-tty=yes \ @@ -600,8 +574,6 @@ /usr/lib/xemacs/%{version}/*-suse-linux/rcs2log /usr/lib/xemacs/%{version}/*-suse-linux/sorted-doc /usr/lib/xemacs/%{version}/*-suse-linux/vcdiff -/usr/lib/xemacs/%{version}/*-suse-linux/wakeup -/usr/lib/xemacs/%{version}/*-suse-linux/yow %dir /usr/lib/xemacs/site-modules/ %dir %{_docdir}/xemacs/ %doc %{_docdir}/xemacs/README.SuSE ++++++ destdir.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xemacs-21.5.29/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/Makefile.in.in -+++ xemacs-21.5.29/Makefile.in.in -@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS= +--- Makefile.in.in ++++ Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -59,6 +59,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -11,7 +9,7 @@ SHELL = /bin/sh LANG = C LC_ALL = C -@@ -394,18 +396,18 @@ install-arch-dep: mkdir +@@ -398,18 +400,18 @@ install-arch-dep: mkdir (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ archlibdir=${archlibdir}) ; done @@ -35,7 +33,7 @@ #endif #ifdef WIN32_NATIVE ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -@@ -417,10 +417,10 @@ install-arch-dep: mkdir +@@ -421,20 +423,20 @@ install-arch-dep: mkdir cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} # else @@ -50,10 +48,6 @@ # endif /* CYGWIN */ #endif /* WIN32_NATIVE */ #ifdef HAVE_SHLIB -@@ -435,13 +437,13 @@ install-arch-dep: mkdir - done; \ - fi - #ifdef HAVE_SHLIB - $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) + $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) #endif @@ -66,7 +60,7 @@ "`(cd $${dir} && $(pwd))`"; then \ : do nothing - echo "rm -rf $$1" ; \ fi ; \ -@@ -449,35 +451,35 @@ install-arch-indep: mkdir info +@@ -442,35 +444,35 @@ install-arch-indep: mkdir info done -set ${COPYDESTS} ; \ for dir in ${COPYDESTS} ; do \ @@ -114,7 +108,7 @@ done @echo "If you would like to save approximately 4M of disk space, do" @echo "make gzip-el" -@@ -487,19 +489,23 @@ install-arch-indep: mkdir info +@@ -480,19 +482,23 @@ install-arch-indep: mkdir info @echo "${lispdir}" gzip-el: @@ -143,21 +137,20 @@ ## Install bundled packages, if present. -Index: xemacs-21.5.29/etc/tests/external-widget/Makefile -=================================================================== ---- xemacs-21.5.29.orig/etc/tests/external-widget/Makefile -+++ xemacs-21.5.29/etc/tests/external-widget/Makefile -@@ -1,3 +1,5 @@ +--- etc/tests/external-widget/Makefile ++++ etc/tests/external-widget/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -16,6 +16,8 @@ + ## You should have received a copy of the GNU General Public License + ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>. + +DESTDIR= + CFLAGS += -Xc -g -DTOOLTALK EMACSHOME = ../../.. EMACSLIBDIR = $(EMACSHOME)/editor/src -Index: xemacs-21.5.29/lib-src/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/lib-src/Makefile.in.in -+++ xemacs-21.5.29/lib-src/Makefile.in.in -@@ -24,6 +24,8 @@ +--- lib-src/Makefile.in.in ++++ lib-src/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -22,6 +22,8 @@ ## above a certain point in this file are in shell format instead of ## in C format. How the hell is this supposed to work? */ @@ -166,7 +159,7 @@ ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o -@@ -246,26 +248,26 @@ do-blessmail: $(blessmail) +@@ -242,26 +244,26 @@ do-blessmail: $(blessmail) ## just run them directly from lib-src. ${archlibdir}: all @echo; echo "Installing utilities run internally by XEmacs." @@ -198,37 +191,31 @@ done uninstall: -Index: xemacs-21.5.29/lwlib/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/lwlib/Makefile.in.in -+++ xemacs-21.5.29/lwlib/Makefile.in.in -@@ -22,6 +22,8 @@ - ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - ## Boston, MA 02111-1307, USA. +--- lwlib/Makefile.in.in ++++ lwlib/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -21,6 +21,8 @@ + ## along with the Lucid Widget Library. If not, see + ## <http://www.gnu.org/licenses/>. +DESTDIR= + ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o .i .s -Index: xemacs-21.5.29/man/Makefile -=================================================================== ---- xemacs-21.5.29.orig/man/Makefile -+++ xemacs-21.5.29/man/Makefile -@@ -20,6 +20,8 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. +--- man/Makefile ++++ man/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -18,6 +18,8 @@ + # You should have received a copy of the GNU General Public License + # along with XEmacs. If not, see <http://www.gnu.org/licenses/>. +DESTDIR= + SHELL = /bin/sh MAKEINFO = makeinfo TEXI2DVI = texi2dvi -Index: xemacs-21.5.29/modules/base64/Makefile -=================================================================== ---- xemacs-21.5.29.orig/modules/base64/Makefile -+++ xemacs-21.5.29/modules/base64/Makefile -@@ -7,6 +7,8 @@ +--- modules/base64/Makefile ++++ modules/base64/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -25,6 +25,8 @@ # 'installed'. # @@ -237,11 +224,9 @@ SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -Index: xemacs-21.5.29/modules/common/Makefile.common -=================================================================== ---- xemacs-21.5.29.orig/modules/common/Makefile.common -+++ xemacs-21.5.29/modules/common/Makefile.common -@@ -31,6 +31,8 @@ +--- modules/common/Makefile.common ++++ modules/common/Makefile.common 2012-03-02 00:00:00.000000000 +0000 +@@ -29,6 +29,8 @@ #define NOT_C_CODE #include "../../src/config.h" @@ -250,7 +235,7 @@ SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ -@@ -98,7 +100,7 @@ extraclean: realclean +@@ -96,7 +98,7 @@ extraclean: realclean -$(RM) *~ \#* install: $(OBJECT_TO_BUILD) @@ -259,11 +244,9 @@ ## ## Local Variables: -Index: xemacs-21.5.29/modules/zlib/Makefile -=================================================================== ---- xemacs-21.5.29.orig/modules/zlib/Makefile -+++ xemacs-21.5.29/modules/zlib/Makefile -@@ -8,6 +8,8 @@ +--- modules/zlib/Makefile ++++ modules/zlib/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -26,6 +26,8 @@ # 'installed'. # @@ -272,33 +255,9 @@ SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -Index: xemacs-21.5.29/netinstall/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/netinstall/Makefile.in.in -+++ xemacs-21.5.29/netinstall/Makefile.in.in -@@ -14,6 +14,8 @@ - ## - ## Makefile for Cygwin installer - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .cc .h .o -@@ -173,7 +175,7 @@ setup-bin.ini: - install: - @echo; echo "Installing net setup." - for file in ${INSTALLABLES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - version.c : $(srcdir)/ChangeLog Makefile -Index: xemacs-21.5.29/src/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/src/Makefile.in.in -+++ xemacs-21.5.29/src/Makefile.in.in -@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS= +--- src/Makefile.in.in ++++ src/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -37,6 +37,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -307,7 +266,7 @@ PROGNAME=@PROGNAME@ prefix=@prefix@ SRC=@srcdir@ -@@ -1065,7 +1067,7 @@ relock: +@@ -1019,7 +1021,7 @@ relock: #ifdef HAVE_SHLIB MAKEPATH=../lib-src/make-path install: $(PROGNAME) @@ -316,7 +275,7 @@ -@echo "Copying include files for ellcc..." -@hdir=`pwd`; \ cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ -@@ -1079,12 +1081,12 @@ install: $(PROGNAME) +@@ -1033,12 +1035,12 @@ install: $(PROGNAME) test -d s && hdrtars="$$hdrtars s/*"; \ test -d m && hdrtars="$$hdrtars m/*"; \ test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ @@ -335,11 +294,9 @@ done) #endif -Index: xemacs-21.5.29/tests/tooltalk/Makefile -=================================================================== ---- xemacs-21.5.29.orig/tests/tooltalk/Makefile -+++ xemacs-21.5.29/tests/tooltalk/Makefile -@@ -12,6 +12,8 @@ +--- tests/tooltalk/Makefile ++++ tests/tooltalk/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -27,6 +27,8 @@ ### Code: ++++++ menus-always-utf8.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xemacs-21.5.29/lwlib/xlwmenu.c +Index: xemacs-21.5.31/lwlib/xlwmenu.c =================================================================== ---- xemacs-21.5.29.orig/lwlib/xlwmenu.c -+++ xemacs-21.5.29/lwlib/xlwmenu.c -@@ -344,12 +344,12 @@ string_width (XlwMenuWidget mw, +--- xemacs-21.5.31.orig/lwlib/xlwmenu.c ++++ xemacs-21.5.31/lwlib/xlwmenu.c +@@ -343,12 +343,12 @@ string_width (XlwMenuWidget mw, #else # ifdef USE_XFONTSET XRectangle ri, rl; @@ -10,14 +10,14 @@ + Xutf8TextExtents (mw->menu.font_set, s, strlen (s), &ri, &rl); return rl.width; # else - #ifdef USE_XFT_MENUBARS + #ifdef HAVE_XFT_MENUBARS XGlyphInfo glyphinfo; - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, strlen (s), &glyphinfo); return glyphinfo.xOff; #else -@@ -436,11 +436,11 @@ string_width_u (XlwMenuWidget mw, +@@ -435,11 +435,11 @@ string_width_u (XlwMenuWidget mw, return width; #else # ifdef USE_XFONTSET @@ -25,13 +25,13 @@ + Xutf8TextExtents (mw->menu.font_set, newchars, j, &ri, &rl); return rl.width; # else /* ! USE_XFONTSET */ - #ifdef USE_XFT_MENUBARS + #ifdef HAVE_XFT_MENUBARS - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, j, &glyphinfo); return glyphinfo.xOff; #else -@@ -770,7 +770,7 @@ x_xft_text_width (Display *dpy, XftFont +@@ -769,7 +769,7 @@ x_xft_text_width (Display *dpy, XftFont { static XGlyphInfo glyphinfo; @@ -40,7 +40,7 @@ xft_font, (FcChar8 *) run, len, &glyphinfo); return glyphinfo.xOff; -@@ -817,12 +817,12 @@ string_draw (XlwMenuWidget mw, +@@ -816,12 +816,12 @@ string_draw (XlwMenuWidget mw, x_xft_text_width (display, renderFont, string, strlen (string)), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ @@ -55,7 +55,7 @@ x, y + mw->menu.font_ascent, string, strlen (string)); # else XDrawString (XtDisplay (mw), window, gc, -@@ -878,10 +878,10 @@ string_draw_range ( +@@ -877,10 +877,10 @@ string_draw_range ( if (end <= start) return 0; @@ -68,7 +68,7 @@ mw->menu.font_set, &string[start], end - start, &ri, &rl); return rl.width; # else -@@ -904,12 +904,12 @@ string_draw_range ( +@@ -903,12 +903,12 @@ string_draw_range ( renderFont, &string[start], end - start), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ ++++++ xemacs-libpng15.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xemacs-beta-b604d235f028/src/glyphs-eimage.c +Index: xemacs-21.5.31/glyphs-eimage.c =================================================================== ---- xemacs-beta-b604d235f028.orig/src/glyphs-eimage.c -+++ xemacs-beta-b604d235f028/src/glyphs-eimage.c -@@ -887,7 +887,8 @@ png_instantiate (Lisp_Object image_insta +--- xemacs-21.5.31/src/glyphs-eimage.c ++++ xemacs-21.5.31/src/glyphs-eimage.c +@@ -911,7 +911,8 @@ png_instantiate (Lisp_Object image_insta Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); struct png_unwind_data unwind; int speccount = specpdl_depth (); @@ -12,78 +12,3 @@ struct png_memory_storage tbr; /* Data to be read */ /* PNG variables */ -@@ -955,8 +956,7 @@ png_instantiate (Lisp_Object image_insta - int y, padding; - Binbyte **row_pointers; - UINT_64_BIT pixels_sq; -- height = info_ptr->height; -- width = info_ptr->width; -+ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); - pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; - if (pixels_sq > ((size_t) -1) / 3) - signal_image_error ("PNG image too large to instantiate", instantiator); -@@ -1018,29 +1018,29 @@ png_instantiate (Lisp_Object image_insta - /* Now that we're using EImage, ask for 8bit RGB triples for any type - of image*/ - /* convert palette images to RGB */ -- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb (png_ptr); - /* convert grayscale images to RGB */ -- else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (color_type == PNG_COLOR_TYPE_GRAY || -+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb (png_ptr); - /* pad images with depth < 8 bits */ -- else if (info_ptr->bit_depth < 8) -+ else if (bit_depth < 8) - { -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) -+ if (color_type == PNG_COLOR_TYPE_GRAY) - png_set_expand (png_ptr); - else - png_set_packing (png_ptr); - } - /* strip 16-bit depth files down to 8 bits */ -- if (info_ptr->bit_depth == 16) -+ if (bit_depth == 16) - png_set_strip_16 (png_ptr); - /* strip alpha channel - #### shouldn't we handle this? - first call png_read_update_info in case above transformations - have generated an alpha channel */ - png_read_update_info(png_ptr, info_ptr); -- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -+ if (color_type & PNG_COLOR_MASK_ALPHA) - png_set_strip_alpha (png_ptr); - - png_read_image (png_ptr, row_pointers); -@@ -1050,19 +1050,22 @@ png_instantiate (Lisp_Object image_insta - * into the glyph code, where you can get to it from lisp - * anyway. - WMP */ - { -- int i; -+ int i, num_text; -+ png_textp text_ptr; - DECLARE_EISTRING (key); - DECLARE_EISTRING (text); -- -- for (i = 0 ; i < info_ptr->num_text ; i++) -+ -+ png_get_text(png_ptr, info_ptr, &text_ptr, &num_text); -+ -+ for (i = 0 ; i < num_text ; i++) - { - /* How paranoid do I have to be about no trailing NULLs, and - using (int)info_ptr->text[i].text_length, and strncpy and a temp - string somewhere? */ - eireset(key); - eireset(text); -- eicpy_ext(key, info_ptr->text[i].key, Qbinary); -- eicpy_ext(text, info_ptr->text[i].text, Qbinary); -+ eicpy_ext(key, text_ptr[i].key, Qbinary); -+ eicpy_ext(text, text_ptr[i].text, Qbinary); - - warn_when_safe (Qpng, Qinfo, "%s - %s", - eidata(key), eidata(text)); ++++++ xemacs-rpmlintrc ++++++ addFilter(".*zero-length.*dump-paths\.el.*") ++++++ xemacs.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -152,37 +152,33 @@ =================================================================== --- xemacs-21.5.29.orig/lib-src/vcdiff +++ xemacs-21.5.29/lib-src/vcdiff -@@ -62,6 +62,17 @@ esac +@@ -75,7 +75,10 @@ case $# in + esac - rev1= rev2= status=0 -+rev1=/tmp/geta$$ -+rev2=/tmp/getb$$ -+rm -f $rev1 $rev2 -+if test -e $rev1 -o -e $rev2 ; then -+ echo "$0: temporaray files exists." 1>&2 +-rev1= rev2= status=0 ++if ! type -p mktemp > /dev/null 2>&1 ; then ++ echo "$0: can not create temporary files." 1>&2 + exit 1 +fi -+if test -n "`type -p mktemp`" ; then -+ rev1="`mktemp ${rev1}.XXXXXX`" || exit 1 -+ rev2="`mktemp ${rev2}.XXXXXX`" || exit 1 -+fi trap 'status=2; exit' 1 2 13 15 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 -@@ -79,14 +90,12 @@ do +@@ -86,14 +89,14 @@ do case $f in s.* | */s.*) if -- rev1=/tmp/geta$$ - get -s -p -k $sid1 "$f" > $rev1 && +- rev1=`mktemp /tmp/geta.XXXXXXXX` ++ rev1=`mktemp /tmp/geta.XXXXXXXX` || exit 1 + sccs get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.\(.*\)'` ;; *) -- rev2=/tmp/getb$$ - get -s -p -k $sid2 "$f" > $rev2 +- rev2=`mktemp /tmp/getb.XXXXXXXX` ++ rev2=`mktemp /tmp/getb.XXXXXXXX` || exit 1 + sccs get -s -p -k $sid2 "$f" > $rev2 workfile=$rev2 esac Index: xemacs-21.5.29/lisp/default.el @@ -203,15 +199,15 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/dumped-lisp.el +++ xemacs-21.5.29/lisp/dumped-lisp.el -@@ -38,6 +38,7 @@ in dumped-lisp.el and is not itself list +@@ -42,6 +42,7 @@ in dumped-lisp.el and is not itself list "cl" - "cl-extra" + "cl-extra" ; also loads cl-macs if we're running interpreted. "cl-seq" -+ "cl-macs" ; Avoid autoloading of kernel functions - "widget" - "custom" ; Before the world so everything can be - ; customized -@@ -303,6 +304,7 @@ in dumped-lisp.el and is not itself list ++ "cl-macs" ; Avoid autoloading of kernel functions + "post-gc" + "version" + "custom" ; Before the world so everything can be customized +@@ -300,6 +301,7 @@ in dumped-lisp.el and is not itself list ;; "sun-eos-debugger-extra" ;; "sun-eos-menubar")) "loaddefs" ; <=== autoloads get loaded here @@ -891,7 +887,7 @@ +++ xemacs-21.5.29/suse/README.SuSE @@ -0,0 +1,18 @@ + -+ XEmacs-21.5.16 ++ XEmacs-21.5.31 + + * Sie finden eine Referenz-Karte im Verzeichnis etc/ + in der Datei refcard.ps, die Sie ausdrucken können. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
