rpms/taglib/FC-6 taglib-1.4_wchar.diff, NONE, 1.1 taglib.spec, 1.13, 1.14

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/taglib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8136/FC-6

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.4_wchar.diff 
Log Message:
add patch for multi-language support

taglib-1.4_wchar.diff:

--- NEW FILE taglib-1.4_wchar.diff ---
diff -ruN taglib-1.4.org/taglib/toolkit/tstring.cpp taglib-1.4/taglib/toolkit/tstring.cpp
--- taglib-1.4.org/taglib/toolkit/tstring.cpp	2005-07-26 06:31:15.000000000 +0900
+++ taglib-1.4/taglib/toolkit/tstring.cpp	2006-05-26 12:02:55.000000000 +0900
@@ -202,12 +202,22 @@
   s.resize(d->data.size());
 
   if(!unicode) {
-    std::string::iterator targetIt = s.begin();
-    for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) {
-      *targetIt = char(*it);
-      ++targetIt;
+    bool cjk = false;
+    //pre-scan: is there any cjk unicode character? if so, convert the string into utf-8.
+    for(unsigned int i=0; i< d->data.size(); i++){
+      if(d->data[i] > 0xff){
+        cjk = true;
+        break;
+      }
+    }
+    if(!cjk){
+      std::string::iterator targetIt = s.begin();
+      for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) {
+        *targetIt = char(*it);
+        ++targetIt;
+      }
+      return s;
     }
-    return s;
   }
 
   const int outputBufferSize = d->data.size() * 3 + 1;


Index: taglib.spec
===================================================================
RCS file: /cvs/extras/rpms/taglib/FC-6/taglib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- taglib.spec	14 Sep 2006 15:07:54 -0000	1.13
+++ taglib.spec	18 Dec 2006 22:19:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:       taglib	
 Version:    1.4
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:	    http://ktown.kde.org/~wheeler/taglib/
 Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .wchar
 
 
 %build
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Thu Dec 14 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4-5
+- add patch for multi-language support
+
 * Thu Sep 14 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4-4
 - have the devel package require pkgconfig (#206443)