devel/notecase notecase-0.8.2-x86_64.patch, NONE, 1.1 notecase.spec, 1.4, 1.5

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/devel/notecase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23702

Modified Files:
	notecase.spec 
Added Files:
	notecase-0.8.2-x86_64.patch 
Log Message:
* Mon Apr 11 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-5
- Add patch from Toshio to fix x86_64 compiler warnings


notecase-0.8.2-x86_64.patch:

--- NEW FILE notecase-0.8.2-x86_64.patch ---
--- notecase/src/lib/FormatHtml.cpp.x86_64	2005-02-01 10:48:40.000000000 -0500
+++ notecase/src/lib/FormatHtml.cpp	2005-04-11 16:52:56.075204059 -0400
@@ -250,7 +250,7 @@
 	{
 		int nDstSize = strlen(szReplace);
 
-		unsigned int nPos = strData.find(szFind);
+		size_t nPos = strData.find(szFind);
 		while(nPos != std::string::npos)
 		{
 			//strData.replace(nPos, nSrcSize, szReplace);
--- notecase/src/interface.cpp.x86_64	2005-03-30 05:59:12.000000000 -0500
+++ notecase/src/interface.cpp	2005-04-11 16:52:01.058334763 -0400
@@ -786,7 +786,7 @@
 									  gpointer         user_data)
 {
 	//pull file name from MRU list
-	int nIdx = (int)user_data;
+	unsigned long nIdx = (unsigned long)user_data;
 
 	if(nIdx < g_objMRU.GetFileCount())
 	{
--- notecase/src/mru.cpp.x86_64	2005-02-05 05:57:22.000000000 -0500
+++ notecase/src/mru.cpp	2005-04-11 16:51:27.894441501 -0400
@@ -134,7 +134,7 @@
 	GtkWidget *menu5 = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (mru_menuitem), menu5);
 
-	unsigned int i;
+	unsigned long i;
 	for(i=0; i<m_lstFiles.size(); i++)
 	{
 		//append an item
--- notecase/src/gui/FileDialog.cpp.x86_64	2005-03-22 03:12:44.000000000 -0500
+++ notecase/src/gui/FileDialog.cpp	2005-04-11 16:52:31.972642260 -0400
@@ -64,7 +64,7 @@
 	//we allow multiple wildcard patterns to be separated with | character
 	std::string strMulti(szPtrn);
 	std::string strPtrn;
-	unsigned int nPos = strMulti.find('|');
+	size_t nPos = strMulti.find('|');
 	while(nPos != std::string::npos)
 	{
 		strPtrn  = strMulti.substr(0, nPos);


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/devel/notecase/notecase.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- notecase.spec	6 Apr 2005 23:44:03 -0000	1.4
+++ notecase.spec	11 Apr 2005 21:02:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           notecase
 Version:        0.8.2
-Release:        4
+Release:        5
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@
 Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-0.8.2_src.zip
 Patch:          notecase-0.8.2-strip-unix2dos.patch
 Patch1:         notecase-0.8.2-paths.patch
+Patch2:         notecase-0.8.2-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix
@@ -25,7 +26,8 @@
 %prep
 %setup -q -n notecase
 %patch -p1
-%patch1 -p1 .paths
+%patch1 -p1 -b .paths
+%patch2 -p1 -b .x86_64
 find docs -type f -exec /usr/bin/dos2unix \{\} \;
 /usr/bin/dos2unix readme.txt
 
@@ -64,7 +66,10 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
-* Tue Apr  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-4
+* Mon Apr 11 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-5
+- Add patch from Toshio to fix x86_64 compiler warnings
+
+* Wed Apr  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-4
 - Change group to Applications/Productivity
 - Have dos2unix only convert files
 - Fixed hard-coded paths in the Makefile