rpms/jd/devel jd-1.8.8cvs-size_t-fix.patch, NONE, 1.1 jd.spec, 1.99, 1.100

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.8cvs-size_t-fix.patch 
Log Message:
* Fri Mar 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Remove size_t warning


jd-1.8.8cvs-size_t-fix.patch:

--- NEW FILE jd-1.8.8cvs-size_t-fix.patch ---
--- jd-build/src/bbslist/bbslistview.cpp.size_t	2007-02-11 20:11:55.000000000 +0900
+++ jd-build/src/bbslist/bbslistview.cpp	2007-03-16 13:26:00.000000000 +0900
@@ -77,7 +77,7 @@
     // 外部板挿入
     m_load_etc = false;
     std::string xml_etc = DBTREE::get_xml_etc();
-    unsigned int pos = xml.find( "<subdir" );
+    std::string::size_type pos = xml.find( "<subdir" );
     if( !xml.empty() && !xml_etc.empty() && pos != std::string::npos ){
 
         m_load_etc = true;
@@ -139,7 +139,7 @@
             const std::string str2 = "</subdir";
             const std::string str3 = ">\n";
 
-            unsigned int pos = xml.find( str1 );
+	    std::string::size_type pos = xml.find( str1 );
             if( pos != std::string::npos ){
 
                 unsigned int pos_end = xml.find( str2, pos + str1.length() );
--- jd-build/src/jdlib/miscutil.cpp.size_t	2007-03-11 01:13:53.000000000 +0900
+++ jd-build/src/jdlib/miscutil.cpp	2007-03-16 13:29:55.000000000 +0900
@@ -337,7 +337,7 @@
 std::string MISC::remove_str( const std::string& str1, const std::string& str2 )
 {
     std::string str_out;
-    unsigned int pos = str1.find( str2 );
+    std::string::size_type pos = str1.find( str2 );
     if( pos != std::string::npos ) str_out = str1.substr( 0, pos ) + str1.substr( pos + str2.length() );
     return str_out;
 }
--- jd-build/src/message/messageviewbase.cpp.size_t	2007-03-12 01:14:36.000000000 +0900
+++ jd-build/src/message/messageviewbase.cpp	2007-03-16 13:27:54.000000000 +0900
@@ -641,7 +641,7 @@
 
             std::string trip;
 
-            unsigned int i = name.find( "#" );
+	    std::string::size_type i = name.find( "#" );
             if( i != std::string::npos ){
 
                 trip = MISC::get_trip( name.substr( i+1 ), DBTREE::board_charset( get_url() ) );


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- jd.spec	15 Mar 2007 16:32:39 -0000	1.99
+++ jd.spec	16 Mar 2007 04:35:58 -0000	1.100
@@ -27,7 +27,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
+%define         rel           0.%{vendor_rel}.%{strtag}.1%{?dist}
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -45,6 +45,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.8cvs-size_t-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .size_t
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -107,6 +109,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Mar 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Remove size_t warning
+
 * Thu Mar 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.cvs070315
 - cvs 070315 (24:55 JST)