Hello community, here is the log from the commit of package xterm checked in at Mon Mar 3 16:49:09 CET 2008. -------- --- xterm/xterm.changes 2008-02-25 12:20:29.000000000 +0100 +++ xterm/xterm.changes 2008-03-03 09:41:04.779271000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 3 09:55:33 CET 2008 - sndirsch@suse.de + +- update to bugfix release xterm-234 + * modify sinstall.sh to use POSIX locale to bypass GNU ls changes + to date-format. + * improved/refined changes for closing bitmap font (patch by + Andrea Odetti). + * improve resize computation for situations where the + negotiation fails, by invoking the xterm widget's + core-class resize method (Debian #365602, patch by Jim Paris). + * restore initialization of terminal's VMIN and VTIME settings, + from patch #232 changes (patch by Matthieu Herrb). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.U29786/_old 2008-03-03 16:48:24.000000000 +0100 +++ /var/tmp/diff_new_pack.U29786/_new 2008-03-03 16:48:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xterm (Version 233) +# spec file for package xterm (Version 234) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm AutoReqProv: on -Version: 233 +Version: 234 Release: 1 Summary: The basic X terminal program Source: %name.tar.gz @@ -269,6 +269,17 @@ /usr/share/pixmaps/* %changelog +* Mon Mar 03 2008 sndirsch@suse.de +- update to bugfix release xterm-234 + * modify sinstall.sh to use POSIX locale to bypass GNU ls changes + to date-format. + * improved/refined changes for closing bitmap font (patch by + Andrea Odetti). + * improve resize computation for situations where the + negotiation fails, by invoking the xterm widget's + core-class resize method (Debian #365602, patch by Jim Paris). + * restore initialization of terminal's VMIN and VTIME settings, + from patch #232 changes (patch by Matthieu Herrb). * Mon Feb 25 2008 sndirsch@suse.de - udpate to bugfix release xterm-233 * Thu Jan 31 2008 sndirsch@suse.de ++++++ xterm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/charproc.c new/xterm-234/charproc.c --- old/xterm-233/charproc.c 2008-02-21 21:21:33.000000000 +0100 +++ new/xterm-234/charproc.c 2008-02-29 02:55:13.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.835 2008/02/21 20:21:33 tom Exp $ */ +/* $XTermId: charproc.c,v 1.836 2008/02/29 01:55:13 tom Exp $ */ /* @@ -5941,6 +5941,19 @@ name = 0; \ } +#ifdef NO_LEAKS +#if OPT_RENDERFONT +static void +xtermCloseXft(TScreen * screen, XftFont ** pub) +{ + if (*pub != 0) { + XftFontClose(screen->display, *pub); + *pub = 0; + } +} +#endif +#endif + static void VTDestroy(Widget w GCC_UNUSED) { @@ -5986,6 +5999,17 @@ xtermCloseFonts(xw, screen->fnts); noleaks_cachedCgs(xw); +#if OPT_RENDERFONT + for (n = 0; n < NMENUFONTS; ++n) { + xtermCloseXft(screen, &(screen->renderFontNorm[n])); + xtermCloseXft(screen, &(screen->renderFontBold[n])); + xtermCloseXft(screen, &(screen->renderFontItal[n])); + xtermCloseXft(screen, &(screen->renderWideNorm[n])); + xtermCloseXft(screen, &(screen->renderWideBold[n])); + xtermCloseXft(screen, &(screen->renderWideItal[n])); + } +#endif + #if 0 /* some strings may be owned by X libraries */ for (n = 0; n <= fontMenu_lastBuiltin; ++n) { int k; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/fontutils.c new/xterm-234/fontutils.c --- old/xterm-233/fontutils.c 2008-02-21 21:21:15.000000000 +0100 +++ new/xterm-234/fontutils.c 2008-02-29 01:25:16.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.269 2008/02/21 20:21:15 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.270 2008/02/29 00:25:16 Andrea.Odetti Exp $ */ /************************************************************ @@ -699,6 +699,9 @@ return code; } +/* + * Close the font and Free the font info + */ XTermFonts * xtermCloseFont(XtermWidget xw, XTermFonts * fnt) { @@ -712,18 +715,6 @@ return 0; } -static XTermFonts * -xtermCloseFont2(XtermWidget xw, XTermFonts * fnt) -{ - if (fnt != 0 && fnt->fs != 0) { - TScreen *screen = TScreenOf(xw); - - clrCgsFonts(xw, WhichVWin(screen), fnt); - XFreeFont(screen->display, fnt->fs); - } - return 0; -} - /* * Close the listed fonts, noting that some may use copies of the pointer. */ @@ -733,13 +724,16 @@ int j, k; for (j = 0; j < fMAX; ++j) { - if (fnts[j].fs != 0) { - xtermCloseFont2(xw, &fnts[j]); + /* + * Need to save the pointer since xtermCloseFont zeroes it + */ + XFontStruct *thisFont = fnts[j].fs; + if (thisFont != 0) { + xtermCloseFont(xw, &fnts[j]); for (k = j + 1; k < fMAX; ++k) { - if (fnts[j].fs == fnts[k].fs) + if (thisFont == fnts[k].fs) xtermFreeFontInfo(&fnts[k]); } - xtermFreeFontInfo(&fnts[j]); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/main.c new/xterm-234/main.c --- old/xterm-233/main.c 2008-02-24 22:49:36.000000000 +0100 +++ new/xterm-234/main.c 2008-02-28 01:28:00.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: main.c,v 1.585 2008/02/24 21:49:36 tom Exp $ */ +/* $XTermId: main.c,v 1.586 2008/02/28 00:28:00 Matthieu.Herrb Exp $ */ /* * W A R N I N G @@ -1873,10 +1873,6 @@ #ifndef USE_TERMIOS /* { */ d_tio.c_line = 0; #endif /* } */ -#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */ - d_tio.c_cc[VMIN] = 1; - d_tio.c_cc[VTIME] = 0; -#endif /* } */ #ifdef HAS_LTCHARS /* { */ d_ltc.t_suspc = CSUSP; /* t_suspc */ d_ltc.t_dsuspc = CDSUSP; /* t_dsuspc */ @@ -1939,6 +1935,10 @@ } } } +#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */ + d_tio.c_cc[VMIN] = 1; + d_tio.c_cc[VTIME] = 0; +#endif /* } */ #ifdef HAS_LTCHARS /* { */ d_ltc.t_suspc = CharOf('\000'); /* t_suspc */ d_ltc.t_dsuspc = CharOf('\000'); /* t_dsuspc */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/scrollbar.c new/xterm-234/scrollbar.c --- old/xterm-233/scrollbar.c 2007-02-11 15:49:56.000000000 +0100 +++ new/xterm-234/scrollbar.c 2008-02-28 02:07:30.000000000 +0100 @@ -1,9 +1,9 @@ -/* $XTermId: scrollbar.c,v 1.132 2007/02/11 14:49:56 tom Exp $ */ +/* $XTermId: scrollbar.c,v 1.134 2008/02/28 01:07:30 tom Exp $ */ /* $XFree86: xc/programs/xterm/scrollbar.c,v 3.48 2006/02/13 01:14:59 dickey Exp $ */ /* - * Copyright 2000-2006,2007 by Thomas E. Dickey + * Copyright 2000-2007,2008 by Thomas E. Dickey * * All Rights Reserved * @@ -192,6 +192,13 @@ geomreqresult = XtMakeResizeRequest((Widget) xw, repWidth, repHeight, NULL, NULL); } + + if (geomreqresult != XtGeometryYes) { + /* The resize wasn't successful, so we might need to adjust + our idea of how large the screen is. */ + TRACE(("...still no (%d) - resize the core-class\n", geomreqresult)); + xw->core.widget_class->core_class.resize((Widget) xw); + } #if 1 /* ndef nothack */ /* * XtMakeResizeRequest() has the undesirable side-effect of clearing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/sinstall.sh new/xterm-234/sinstall.sh --- old/xterm-233/sinstall.sh 2006-01-04 03:10:27.000000000 +0100 +++ new/xterm-234/sinstall.sh 2008-03-03 00:35:02.000000000 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -# $XTermId: sinstall.sh,v 1.15 2006/01/04 02:10:27 tom Exp $ -# $XFree86: xc/programs/xterm/sinstall.sh,v 1.5 2006/01/04 02:10:27 dickey Exp $ +# $XTermId: sinstall.sh,v 1.16 2008/03/02 23:35:02 tom Exp $ # # Install program setuid if the installer is running as root, and if xterm is # already installed on the system with setuid privilege. This is a safeguard @@ -20,6 +19,13 @@ trace=: trace=echo +# override locale... +# (otherwise GNU ls displays date column in a locale-dependent manner). +LANG=C; export LANG +LANGUAGE=C; export LANGUAGE +LC_ALL=C; export LC_ALL +LC_CTYPE=C; export LC_CTYPE + OPTS_SUID= OPTS_SGID= OPTS_MODE= @@ -79,11 +85,13 @@ # Expect listing to have fields like this: #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname + ls $cf_option $REF_PROG ls $cf_option $REF_PROG >$MYTEMP read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <$MYTEMP $trace "... if \"$cf_rest\" is null, try the ls -g option" if test -z "$cf_rest" ; then cf_option="$cf_option -g" + ls $cf_option $REF_PROG ls $cf_option $REF_PROG >$MYTEMP read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <$MYTEMP fi @@ -105,14 +113,17 @@ $trace "... see if mode \"$cf_mode\" has s-bit set" case ".$cf_mode" in #(vi .???s??s*) #(vi + $trace "... both setuid/setgid" PROG_SUID=4000 PROG_SGID=2000 ;; .???s*) #(vi + $trace "... setuid" PROG_SUID=4000 PROG_GRP= ;; .??????s*) + $trace "... setgid" PROG_SGID=2000 PROG_USR= ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/version.h new/xterm-234/version.h --- old/xterm-233/version.h 2008-02-20 21:32:21.000000000 +0100 +++ new/xterm-234/version.h 2008-02-28 01:17:03.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.289 2008/02/20 20:32:21 tom Exp $ */ +/* $XTermId: version.h,v 1.290 2008/02/28 00:17:03 tom Exp $ */ /* * These definitions are used to build the string that's printed in response to @@ -6,7 +6,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 233 +#define XTERM_PATCH 234 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xterm-233/xterm.log.html new/xterm-234/xterm.log.html --- old/xterm-233/xterm.log.html 2008-02-25 00:46:20.000000000 +0100 +++ new/xterm-234/xterm.log.html 2008-03-03 00:32:51.000000000 +0100 @@ -20,7 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.659 2008/02/24 23:46:20 tom Exp $ + $XTermId: xterm.log.html,v 1.664 2008/03/02 23:32:51 tom Exp $ --> <HTML> <HEAD> @@ -45,6 +45,7 @@ is the latest version of this file. <UL> +<LI><A HREF="#xterm_234">Patch #234 - 2008-03/02</A> <LI><A HREF="#xterm_233">Patch #233 - 2008/02/24</A> <LI><A HREF="#xterm_232">Patch #232 - 2008/01/30</A> <LI><A HREF="#xterm_231">Patch #231 - 2008/01/05</A> @@ -281,6 +282,24 @@ <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A> </UL> +<H1><A NAME="xterm_234">Patch #234 - 2008-03/02</A></H1> +<ul> + <li>modify <code>sinstall.sh</code> to use POSIX locale to + bypass GNU ls changes to date-format. + + <li>improved/refined changes for closing bitmap font (patch by + Andrea Odetti). + + <li>improve resize computation for situations where the negotiation + fails, by invoking the xterm widget's core-class resize method + (Debian #365602, patch by Jim Paris). + + <li>restore initialization of terminal's <code>VMIN</code> and + <code>VTIME</code> settings, + from <a href="#xterm_232">patch #232</a> changes + (patch by Matthieu Herrb). +</ul> + <H1><A NAME="xterm_233">Patch #233 - 2008/02/24</A></H1> <ul> <li>add configure check for <code>ttydefaults.h</code>, include if ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- 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