files/xterm-scrollbar.patch

xterm-scrollbar.patch (text/plain), 5.51 KB, created by Martin Zwickel on 2006-02-07 23:38:14 UTC

# ------------------------------------------------------------------------------
# aclocal.m4     |    8 ++++----
# charproc.c     |    4 +++-
# configure      |    6 +++---
# version.h      |    4 ++--
# xterm.log.html |   18 +++++++++++++++++-
# 5 files changed, 29 insertions(+), 11 deletions(-)
# ------------------------------------------------------------------------------
Index: aclocal.m4
--- xterm-208+/aclocal.m4	2006-01-04 02:10:19.000000000 +0000
+++ xterm-208b/aclocal.m4	2006-01-08 22:07:48.000000000 +0000
@@ -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
--- xterm-208+/charproc.c	2006-01-04 02:10:19.000000000 +0000
+++ xterm-208b/charproc.c	2006-01-06 00:47:54.000000000 +0000
@@ -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
--- xterm-208+/configure	2006-01-04 01:32:24.000000000 +0000
+++ xterm-208b/configure	2006-01-08 22:07:48.000000000 +0000
@@ -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
--- xterm-208+/version.h	2006-01-04 02:10:27.000000000 +0000
+++ xterm-208b/version.h	2006-01-06 01:12:59.000000000 +0000
@@ -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-208+/xterm.log.html	2006-01-04 02:10:27.000000000 +0000
+++ xterm-208b/xterm.log.html	2006-01-08 22:11:47.000000000 +0000
@@ -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&#237;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