rpms/nomadsync/devel nomadsync-baseclass.patch, NONE, 1.1 nomadsync-baseclass2.patch, NONE, 1.1 nomadsync.spec, 1.3, 1.4

[Linus Walleij (snirkel)]

Author: snirkel

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

Modified Files:
	nomadsync.spec 
Added Files:
	nomadsync-baseclass.patch nomadsync-baseclass2.patch 
Log Message:
Patching two files to make GCC4.1.0 happy.


nomadsync-baseclass.patch:

--- NEW FILE nomadsync-baseclass.patch ---
--- src/BaseNomad.h~	2004-10-18 17:06:18.000000000 +0200
+++ src/BaseNomad.h	2006-03-15 22:14:36.000000000 +0100
@@ -17,7 +17,7 @@
 class BaseNomad
 {
 public:
-	BaseNomad::BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){}
+	BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){}
 	virtual ~BaseNomad();
 	void RemoveTracks();
 	void RemovePlaylists();

nomadsync-baseclass2.patch:

--- NEW FILE nomadsync-baseclass2.patch ---
--- src/EzGrid.h~	2005-01-20 14:39:50.000000000 +0100
+++ src/EzGrid.h	2006-03-15 22:22:10.000000000 +0100
@@ -8,7 +8,7 @@
 class EzGrid : public wxGrid
 {
 public:
-	EzGrid::EzGrid(wxWindow *parent,
+        EzGrid(wxWindow *parent,
 		wxWindowID id,	const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS,
 		const wxString& name = wxPanelNameStr);


Index: nomadsync.spec
===================================================================
RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nomadsync.spec	13 Mar 2006 20:47:03 -0000	1.3
+++ nomadsync.spec	15 Mar 2006 21:39:41 -0000	1.4
@@ -12,7 +12,7 @@
 
 Name:		nomadsync
 Version:	0.4.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A music synchronization program form portable audio players
 URL:		http://nomadsync.sourceforge.net/
 Group:		Applications/Multimedia
@@ -20,6 +20,8 @@
 Source1:	%{name}.desktop
 Patch0:		nomadsync-libnjbloc.patch
 Patch1:		nomadsync-libnjbloc64.patch
+Patch2:		nomadsync-baseclass.patch
+Patch3:		nomadsync-baseclass2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	GPL
 Requires(post):	desktop-file-utils
@@ -44,6 +46,8 @@
 %else
 %patch0 -p0
 %endif
+%patch2 -p0
+%patch3 -p0
 
 %build
 %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config
@@ -89,6 +93,9 @@
 %doc ChangeLog authors copying readme
 
 %changelog
+* Wed Mar 15 2006 Linus Walleij <triad at df.lth.se> 0.4.2-11
+- Patched a baseclass issue that annoyed GCC 4.1.0
+
 * Mon Mar 13 2006 Linus Walleij <triad at df.lth.se> 0.4.2-10
 - Fixed a x86_64 bug, by separate patching, I think...