rpms/xchm/devel xchm-1.13-gcc43.patch,NONE,1.1 xchm.spec,1.10,1.11

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/xchm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30650

Modified Files:
	xchm.spec 
Added Files:
	xchm-1.13-gcc43.patch 
Log Message:
* Sat Jan  5 2008 Patrice Dumas <pertusus at free.fr> 1.13-2
- fixes for gcc 4.3


xchm-1.13-gcc43.patch:

--- NEW FILE xchm-1.13-gcc43.patch ---
diff -up xchm-1.13/src/chmfile.h.gcc43 xchm-1.13/src/chmfile.h
--- xchm-1.13/src/chmfile.h.gcc43	2008-01-04 22:16:58.000000000 +0100
+++ xchm-1.13/src/chmfile.h	2008-01-04 22:18:51.000000000 +0100
@@ -278,7 +278,7 @@ private:
 	//! Retrieve the data (name/URL) for a single entry (TOC or index)
 	bool GetItem(UCharPtr& topics, UCharPtr& strings, UCharPtr& urltbl,
 		     UCharPtr& urlstr, u_int32_t index, wxTreeCtrl *toBuild,
-		     CHMListCtrl* toBuild, const wxString& idxName,
+		     CHMListCtrl* toBuildList, const wxString& idxName,
 		     const wxCSConv& cv, int level, bool local);
 
 	//! Get the binary index (if available)


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xchm.spec	8 Aug 2007 15:43:17 -0000	1.10
+++ xchm.spec	4 Jan 2008 23:07:59 -0000	1.11
@@ -1,11 +1,12 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
 Version:        1.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Publishing
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+Patch0:         xchm-1.13-gcc43.patch
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
 BuildRequires:  wxGTK-devel >= 2.6
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-dependency-tracking
@@ -66,6 +68,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Jan  5 2008 Patrice Dumas <pertusus at free.fr> 1.13-2
+- fixes for gcc 4.3
+
 * Wed Aug  8 2007 Patrice Dumas <pertusus at free.fr> 1.13-1
 - update to 1.13