rpms/xterm/devel xterm-211-bz186935.patch, 1.1, 1.2 xterm.spec, 1.40, 1.41

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21400

Modified Files:
	xterm-211-bz186935.patch xterm.spec 
Log Message:
fix bug 186935: cursor GCs must be freed with XtReleaseGC

xterm-211-bz186935.patch:
 charproc.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

Index: xterm-211-bz186935.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm-211-bz186935.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xterm-211-bz186935.patch	28 Mar 2006 00:35:00 -0000	1.1
+++ xterm-211-bz186935.patch	29 Mar 2006 17:23:52 -0000	1.2
@@ -1,6 +1,6 @@
---- xterm-211/charproc.c.bz186935	2006-03-27 14:59:36.000000000 -0500
-+++ xterm-211/charproc.c	2006-03-27 15:00:55.000000000 -0500
-@@ -5762,14 +5762,31 @@
+--- xterm-211/charproc.c.bz186935	2006-03-28 19:44:35.000000000 -0500
++++ xterm-211/charproc.c	2006-03-29 11:32:23.000000000 -0500
+@@ -5762,14 +5762,21 @@
  static void
  releaseCursorGCs(TScreen * screen)
  {
@@ -9,31 +9,23 @@
 -    if (screen->fillCursorGC)
 -	XFreeGC(screen->display, screen->fillCursorGC);
 -    if (screen->reversecursorGC)
-+    GC cursorGC=screen->cursorGC, fillCursorGC=screen->fillCursorGC, 
-+       reverseCursorGC=screen->reversecursorGC, cursorOutlineGC=screen->cursoroutlineGC;
-+
-+    if ( cursorGC )    
-+	XFreeGC(screen->display, cursorGC);
+-	XFreeGC(screen->display, screen->reversecursorGC);
+-    if (screen->cursoroutlineGC)
+-	XFreeGC(screen->display, screen->cursoroutlineGC);
++    if ( screen->cursorGC )    
++	XtReleaseGC((Widget)term, screen->cursorGC );
 +    screen->cursorGC = 0;
 +
-+    if ( fillCursorGC && (fillCursorGC != cursorGC))
-+	XFreeGC(screen->display, fillCursorGC);
++    if ( screen->fillCursorGC )
++	XtReleaseGC((Widget)term, screen->fillCursorGC);
 +    screen->fillCursorGC = 0;
 +
-+    if (   reverseCursorGC 
-+       &&( reverseCursorGC != cursorGC ) 
-+       &&( reverseCursorGC != fillCursorGC )
-+       )
- 	XFreeGC(screen->display, screen->reversecursorGC);
--    if (screen->cursoroutlineGC)
++    if ( screen->reversecursorGC )
++	XtReleaseGC((Widget)term, screen->reversecursorGC);
 +    screen->reversecursorGC = 0;
 +
-+    if (    cursorOutlineGC 
-+       && ( cursorOutlineGC != cursorGC ) 
-+       && ( cursorOutlineGC != fillCursorGC ) 
-+       && ( cursorOutlineGC != reverseCursorGC )
-+       )
- 	XFreeGC(screen->display, screen->cursoroutlineGC);
++    if ( screen->cursoroutlineGC )
++	XtReleaseGC((Widget)term, screen->cursoroutlineGC);
 +    screen->cursoroutlineGC = 0;
  }
  


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xterm.spec	21 Mar 2006 22:49:56 -0000	1.40
+++ xterm.spec	29 Mar 2006 17:23:52 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 211
-Release: 1.FC6
+Release: 4.FC6
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -22,7 +22,7 @@
 Patch9: xterm-209-bz182382.patch
 Patch10: xterm-209-bz183993.patch
 Patch11: xterm-211-bz186094.patch
-
+Patch12: xterm-211-bz186935.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -41,7 +41,8 @@
 BuildRequires: libtermcap-devel
 BuildRequires: utempter
 
-%{?!DEBUGINFO:  %define DEBUGINFO   1}
+%{?!DEBUGINFO:     %define DEBUGINFO    1}
+%{?!enable_trace:  %define enable_trace 0}
 %if !%{DEBUGINFO}
 %define debug_package %{nil}
 %endif
@@ -74,10 +75,15 @@
 #%patch10 -p1 -b .bz183993
 #      ^- patch now upstream
 %patch11 -p1 -b .bz186094
+%patch12 -p1 -b .bz186935
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
+%if %{DEBUGINFO}
 export CFLAGS="$RPM_OPT_FLAGS"
+%else
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
+%endif
 %configure --enable-luit \
            --enable-warnings \
            --enable-wide-chars \
@@ -90,6 +96,9 @@
 %if %{_with_256_color}
 	   --enable-256-color \
 %endif
+%if %{enable_trace}
+	   --enable-trace \
+%endif
 ;
 export XTERM_TTY_GROUP_NAME=tty;
 make
@@ -123,6 +132,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 211-4
+- fix bug 186935: cursor GCs must be freed with XtReleaseGC
+
 * Tue Mar 21 2006 Jason Vas Dias <jvdias at redhat.com> - 211-1
 - Upgrade to upstream version 211 (fixes bug 186094).
 - Enable new 'utf8Title' resource by default