Author: ender Date: 2006-01-09 02:33:03 -0500 (Mon, 09 Jan 2006) New Revision: 1041
Added: branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff Modified: branches/modular/app/xterm/debian/changelog branches/modular/app/xterm/debian/patches/series branches/modular/app/xterm/debian/rules Log: * Added 000_stolen_from_HEAD.diff, with last minute changes from Thomas Dickey: - fix typo in configure script option --disable-narrowproto. - Amend CF_X_FREETYPE changes for pkg-config check to ensure that Xft is known to that tool. - Add an ifdef to allow ./configure --disable-active-icon to work, broken by new code for testing memory leaks in #208. * Replaced --disable-narrowproto by --enable-narrowproto in configure line in order to deal with toolbar problems due to the absence of NARROWPROTO definition (closes: 346398). Modified: branches/modular/app/xterm/debian/changelog =================================================================== --- branches/modular/app/xterm/debian/changelog 2006-01-09 03:31:13 UTC (rev 1040) +++ branches/modular/app/xterm/debian/changelog 2006-01-09 07:33:03 UTC (rev 1041) @@ -1,10 +1,17 @@ xterm (208-2) unstable; urgency=low - * Added --disable-imake and --disable-narrowproto to configure line in order + * Added 000_stolen_from_HEAD.diff, with last minute changes from Thomas + Dickey: + - fix typo in configure script option --disable-narrowproto. + - Amend CF_X_FREETYPE changes for pkg-config check to ensure that Xft is + known to that tool. + - Add an ifdef to allow ./configure --disable-active-icon to work, broken + by new code for testing memory leaks in #208. + * Added --disable-imake and --enable-narrowproto to configure line in order to deal with toolbar problems due to the absence of NARROWPROTO definition (closes: 346398). - -- David MartÃnez Moreno <[EMAIL PROTECTED]> Sun, 8 Jan 2006 03:33:01 +0100 + -- David MartÃnez Moreno <[EMAIL PROTECTED]> Mon, 9 Jan 2006 08:21:41 +0100 xterm (208-1) unstable; urgency=low Added: branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff =================================================================== --- branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff 2006-01-09 03:31:13 UTC (rev 1040) +++ branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff 2006-01-09 07:33:03 UTC (rev 1041) @@ -0,0 +1,153 @@ +$Id$ + +Update to last snapshot of xterm #209 in order to fix problems with enable_narrowproto +in configure. + +It should be dropped when #209 see the light. + +Index: aclocal.m4 +=================================================================== +--- aclocal.m4.orig 2006-01-09 08:09:20.212471697 +0100 ++++ aclocal.m4 2006-01-09 08:09:43.170032108 +0100 +@@ -1,4 +1,4 @@ +-dnl $XTermId: aclocal.m4,v 1.211 2006/01/04 02:10:19 tom Exp $ ++dnl $XTermId: aclocal.m4,v 1.213 2006/01/08 22:07:48 tom Exp $ + dnl + dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.61 2006/01/04 02:10:19 dickey Exp $ + dnl +@@ -391,7 +391,7 @@ + CF_ARG_OPTION(narrowproto, + [ --enable-narrowproto enable narrow prototypes for X libraries], + [enable_narrowproto=$enableval], +- [enable_narrowproto=$default_narrowproto], ++ [enable_narrowproto=$cf_default_narrowproto], + [$cf_default_narrowproto]) + AC_MSG_RESULT($enable_narrowproto) + ]) +@@ -2251,7 +2251,7 @@ + AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_X_FREETYPE version: 13 updated: 2005/11/24 21:35:11 ++dnl CF_X_FREETYPE version: 14 updated: 2006/01/07 14:31:43 + dnl ------------- + dnl Check for X FreeType headers and libraries (XFree86 4.x, etc). + dnl +@@ -2271,7 +2271,7 @@ + FREETYPE_PARAMS= + + AC_PATH_PROG(FREETYPE_PKG_CONFIG, pkg-config, none) +-if test "$FREETYPE_PKG_CONFIG" != none; then ++if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG + FREETYPE_PARAMS=xft + else +Index: charproc.c +=================================================================== +--- charproc.c.orig 2006-01-09 08:09:20.212471697 +0100 ++++ charproc.c 2006-01-09 08:09:43.190033468 +0100 +@@ -1,4 +1,4 @@ +-/* $XTermId: charproc.c,v 1.633 2006/01/04 02:10:19 tom Exp $ */ ++/* $XTermId: charproc.c,v 1.634 2006/01/06 00:47:54 tom Exp $ */ + + /* + * $Xorg: charproc.c,v 1.6 2001/02/09 02:06:02 xorgcvs Exp $ +@@ -5731,7 +5731,9 @@ + #endif + releaseCursorGCs(screen); + releaseWindowGCs(w, &(screen->fullVwin)); ++#ifndef NO_ACTIVE_ICON + releaseWindowGCs(w, &(screen->iconVwin)); ++#endif + + if (screen->fnt_bold != 0 + && screen->fnt_bold != screen->fnt_norm) +Index: configure +=================================================================== +--- configure.orig 2006-01-09 08:09:20.208471425 +0100 ++++ configure 2006-01-09 08:09:43.202034283 +0100 +@@ -8457,11 +8457,11 @@ + if test "$enableval" != "$cf_default_narrowproto" ; then + enable_narrowproto=$enableval + else +- enable_narrowproto=$default_narrowproto ++ enable_narrowproto=$cf_default_narrowproto + fi + else + enableval=$cf_default_narrowproto +- enable_narrowproto=$default_narrowproto ++ enable_narrowproto=$cf_default_narrowproto + + fi; + echo "$as_me:8467: result: $enable_narrowproto" >&5 +@@ -9382,7 +9382,7 @@ + echo "${ECHO_T}no" >&6 + fi + +-if test "$FREETYPE_PKG_CONFIG" != none; then ++if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG + FREETYPE_PARAMS=xft + else +Index: version.h +=================================================================== +--- version.h.orig 2006-01-09 08:09:20.220472241 +0100 ++++ version.h 2006-01-09 08:10:34.461518359 +0100 +@@ -1,4 +1,4 @@ +-/* $XTermId: version.h,v 1.256 2006/01/04 02:10:27 tom Exp $ */ ++/* $XTermId: version.h,v 1.257 2006/01/06 01:12:59 tom Exp $ */ + /* $XFree86: xc/programs/xterm/version.h,v 3.119 2006/01/04 02:10:27 dickey Exp $ */ + + /* +@@ -7,7 +7,7 @@ + * version of X to which this version of xterm has been built. The number in + * parentheses is my patch number (T.Dickey). + */ +-#define XTERM_PATCH 208 ++#define XTERM_PATCH 209 + + #ifndef __vendorversion__ + #define __vendorversion__ "XTerm" +Index: xterm.log.html +=================================================================== +--- xterm.log.html.orig 2006-01-09 08:09:20.220472241 +0100 ++++ xterm.log.html 2006-01-09 08:09:43.218035371 +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.359 2006/01/04 02:10:27 tom Exp $ ++ $XTermId: xterm.log.html,v 1.362 2006/01/08 22:11:47 tom Exp $ + $XFree86: xc/programs/xterm/xterm.log.html,v 1.144 2006/01/04 02:10:27 dickey Exp $ + --> + <HTML> +@@ -46,6 +46,7 @@ + is the latest version of this file. + + <UL> ++<LI><A HREF="#xterm_209">Patch #209 - 2006/1/?? - XFree86 4.5.99.19</A> + <LI><A HREF="#xterm_208">Patch #208 - 2006/1/3 - XFree86 4.5.99.19</A> + <LI><A HREF="#xterm_207">Patch #207 - 2005/11/13 - XFree86 4.5.99.16</A> + <LI><A HREF="#xterm_206">Patch #206 - 2005/11/3 - XFree86 4.5.99.15</A> +@@ -257,6 +258,21 @@ + <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A> + </UL> + ++<H1><A NAME="xterm_209">Patch #209 - 2006/1/?? - XFree86 4.5.99.19</A></H1> ++<ul> ++ <li>fix typo in configure script option ++ <code>--disable-narrowproto</code> ++ (report by David Martínez Moreno). ++ ++ <li>amend CF_X_FREETYPE changes for <code>pkg-config</code> check to ++ ensure that <code>Xft</code> is known to that tool (report and ++ patch by Emanuele Giaquinta). ++ ++ <li>add an ifdef to allow <code>./configure --disable-active-icon</code> ++ to work, broken by new code for testing memory leaks in ++ <a href="#xterm_208">patch #208</a> (report by Brian Lindholm). ++</ul> ++ + <H1><A NAME="xterm_208">Patch #208 - 2006/1/3 - XFree86 4.5.99.19</A></H1> + <ul> + <li>add <code>charClass</code> resource to <code>XTerm.ad</code> and Property changes on: branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/modular/app/xterm/debian/patches/series =================================================================== --- branches/modular/app/xterm/debian/patches/series 2006-01-09 03:31:13 UTC (rev 1040) +++ branches/modular/app/xterm/debian/patches/series 2006-01-09 07:33:03 UTC (rev 1041) @@ -1,2 +1,3 @@ +001_stolen_from_HEAD.diff -p0 900_debian_xterm.diff -p0 901_xterm_manpage.diff -p0 Modified: branches/modular/app/xterm/debian/rules =================================================================== --- branches/modular/app/xterm/debian/rules 2006-01-09 03:31:13 UTC (rev 1040) +++ branches/modular/app/xterm/debian/rules 2006-01-09 07:33:03 UTC (rev 1041) @@ -88,7 +88,7 @@ ./configure --enable-logging --enable-wide-chars --enable-256-color \ --prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man \ --with-app-defaults=/etc/X11/app-defaults \ - --disable-imake --disable-narrowproto + --disable-imake --enable-narrowproto touch $@ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]