rpms/xpaint/F-12 xpaint-2.8.15-text-ctrlH-segfault.patch, NONE, 1.1 import.log, 1.5, 1.6 xpaint.spec, 1.5, 1.6

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/xpaint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7182/F-12

Modified Files:
	import.log xpaint.spec 
Added Files:
	xpaint-2.8.15-text-ctrlH-segfault.patch 
Log Message:
applied text-ctrlH-segfault.patch

xpaint-2.8.15-text-ctrlH-segfault.patch:
 Paint.c |    5 !!!!!
 1 file changed, 5 modifications(!)

--- NEW FILE xpaint-2.8.15-text-ctrlH-segfault.patch ---
*** xpaint-2.8.15/Paint.c	2010-01-19 22:46:59.000000000 +0100
--- xpaint-2.8.15.2/Paint.c	2010-02-03 09:51:57.579812096 +0100
***************
*** 1580,1587 ****
  	      rect->x, rect->y, rect->width, rect->height,
  	      rect->x, rect->y);
  
!     memcpy(pw->paint.current.alpha, pw->paint.undo->alphapix.alpha,
!            rect->width * rect->height);
      PwUpdate(w, rect, True);
  }
  
--- 1580,1588 ----
  	      rect->x, rect->y, rect->width, rect->height,
  	      rect->x, rect->y);
  
!     if (pw->paint.current.alpha && pw->paint.undo->alphapix.alpha)
!         memcpy(pw->paint.current.alpha, pw->paint.undo->alphapix.alpha,
!                rect->width * rect->height);
      PwUpdate(w, rect, True);
  }
  


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	2 Feb 2010 13:25:13 -0000	1.5
+++ import.log	6 Feb 2010 10:01:07 -0000	1.6
@@ -3,3 +3,4 @@ xpaint-2_8_7_3-1_fc10:F-12:xpaint-2.8.7.
 xpaint-2_8_13_1-1_fc12:F-12:xpaint-2.8.13.1-1.fc12.src.rpm:1264777005
 xpaint-2_8_13_1-3_fc12:F-12:xpaint-2.8.13.1-3.fc12.src.rpm:1264801916
 xpaint-2_8_15-1_fc12:F-12:xpaint-2.8.15-1.fc12.src.rpm:1265117090
+xpaint-2_8_15-2_fc12:F-12:xpaint-2.8.15-2.fc12.src.rpm:1265450449


Index: xpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-12/xpaint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xpaint.spec	2 Feb 2010 13:25:13 -0000	1.5
+++ xpaint.spec	6 Feb 2010 10:01:07 -0000	1.6
@@ -4,11 +4,12 @@
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
 Version:        2.8.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
 Source0:        http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
+Patch0:         xpaint-2.8.15-text-ctrlH-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bison flex imake chrpath
@@ -46,6 +47,7 @@ some support for batch processing.
 
 %prep
 %setup -q
+%patch0 -p1 
 sed -i -e 's|/lib |/%{_lib} |g' Local.config
 sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
 sed -i -e 's|/usr/lib|%{_libdir}|g' configure
@@ -116,6 +118,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Fri Feb 05 2010 Paulo Roma <roma at lcg.ufrj.br> 2.8.15-2
+- Applied patch text-ctrlH-segfault.
+
 * Tue Feb 02 2010 Paulo Roma <roma at lcg.ufrj.br> 2.8.15-1
 - Updated to 2.8.15: #BUG 559938
 - Added BR psutils.