[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#694413: unblock: kawari8/8.2.8-7



Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

Dear release team,

kawari8 currently segfault on testing amd64. Renders the package
unusable on testing amd64. The bug report is #693893.
I've applied a patch from the upstream BTS and the package is already
uploaded to sid.
Please consider unblocking package kawari8.

The debdiff is as attachment.

Many Thanks,
Paul

unblock kawari8/8.2.8-7

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=zh_TW.utf8, LC_CTYPE=zh_TW.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
                                PaulLiu (劉穎駿)
E-mail: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
diff -u kawari8-8.2.8/debian/changelog kawari8-8.2.8/debian/changelog
--- kawari8-8.2.8/debian/changelog
+++ kawari8-8.2.8/debian/changelog
@@ -1,3 +1,11 @@
+kawari8 (8.2.8-7) unstable; urgency=low
+
+  * Fix segfaults on 64bit arch (Closes: #693893)
+    - Add patch 009_kawari8-64bit-fix.patch
+    - Thanks to Shyouzou Sugitani <shy@users.sourceforge.jp>
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Sat, 24 Nov 2012 10:50:41 +0800
+
 kawari8 (8.2.8-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- kawari8-8.2.8.orig/debian/patches/009_kawari8-64bit-fix.patch
+++ kawari8-8.2.8/debian/patches/009_kawari8-64bit-fix.patch
@@ -0,0 +1,78 @@
+diff -ur ../dist/src/kis/kis_file.cpp ./src/kis/kis_file.cpp
+--- src/kis/kis_file.cpp	2012-11-21 22:21:11.000000000 +0900
++++ src/kis/kis_file.cpp	2012-11-21 22:17:14.000000000 +0900
+@@ -228,7 +228,7 @@
+ 	string dirname=PathToBaseDir(CanonicalPath(Engine->GetDataPath(), args[1]));
+ 	string filename=PathToFileName(CanonicalPath(Engine->GetDataPath(), args[1]));
+ 
+-	unsigned int pos=ctow(dirname).rfind(FILE_SEPARATOR);
++	string::size_type pos=ctow(dirname).rfind(FILE_SEPARATOR);
+ 	if(pos==string::npos) {
+ 		// ¥Õ¥ë¥Ñ¥¹¤Ê¤Î¤Ëdirname¤ËFILE_SEPARATOR¤¬¤Ê¤¤¾ì¹ç¡¢¿äÄê¤Ç¥ë¡¼¥È
+ 		// FILE_SEPARATOR¤òÄɲä·¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤È¤Î¸íǧ¤òËɤ°
+diff -ur ../dist/src/kis/kis_split.cpp ./src/kis/kis_split.cpp
+--- src/kis/kis_split.cpp	2012-11-21 22:21:01.000000000 +0900
++++ src/kis/kis_split.cpp	2012-11-21 22:17:00.000000000 +0900
+@@ -60,7 +60,7 @@
+ 	if (!HasNext())
+ 		return "";
+ 
+-	unsigned int idx;	// ÃíÌÜÃæ¤Î¥Ý¥¤¥ó¥¿
++	string::size_type idx;	// ÃíÌÜÃæ¤Î¥Ý¥¤¥ó¥¿
+ 	string ret;
+ 	if(cs.length()==0){
+ 		// ¶èÀÚ¤êʸ»ú̵¤·
+diff -ur ../dist/src/libkawari/kawari_code.cpp ./src/libkawari/kawari_code.cpp
+--- src/libkawari/kawari_code.cpp	2012-11-21 22:20:12.000000000 +0900
++++ src/libkawari/kawari_code.cpp	2012-11-21 22:15:50.000000000 +0900
+@@ -112,11 +112,11 @@
+ 	const static wstring wdq=ctow("\"");
+ 	wstring ws=ctow(s);
+ 	wstring retstr=ctow("\"");
+-	unsigned int len=ws.size();
+-	unsigned int pos=0;
++	wstring::size_type len=ws.size();
++	wstring::size_type pos=0;
+ 
+ 	while(pos<len) {
+-		unsigned int pos2=ws.find_first_of(illchs, pos);
++		wstring::size_type pos2=ws.find_first_of(illchs, pos);
+ 		if (pos2==string::npos) {
+ 			retstr+=ws.substr(pos);
+ 			break;
+diff -ur ../dist/src/saori/saori_java.cpp ./src/saori/saori_java.cpp
+--- src/saori/saori_java.cpp	2012-11-21 22:20:36.000000000 +0900
++++ src/saori/saori_java.cpp	2012-11-21 22:13:28.000000000 +0900
+@@ -201,7 +201,7 @@
+ 	jobject obj_saori=(jobject)handle;
+ 
+ 	string basepath;
+-	unsigned int pos=path.find_last_of(FILE_SEPARATOR);
++	string::size_type pos=path.find_last_of(FILE_SEPARATOR);
+ 	if (pos==string::npos){
+ 		basepath=path+FILE_SEPARATOR;
+ 	}else{
+diff -ur ../dist/src/saori/saori_python.cpp ./src/saori/saori_python.cpp
+--- src/saori/saori_python.cpp	2012-11-21 22:20:23.000000000 +0900
++++ src/saori/saori_python.cpp	2012-11-21 22:13:10.000000000 +0900
+@@ -72,7 +72,7 @@
+ // SAORI/1.0 Load
+ bool TModulePython::Load(void){
+ 	string basepath;
+-	unsigned int pos=path.find_last_of(FILE_SEPARATOR);
++	string::size_type pos=path.find_last_of(FILE_SEPARATOR);
+ 	if (pos==string::npos){
+ 		basepath=path+FILE_SEPARATOR;
+ 	}else{
+diff -ur ../dist/src/tool/kosui.cpp ./src/tool/kosui.cpp
+--- src/tool/kosui.cpp	2012-11-21 22:19:57.000000000 +0900
++++ src/tool/kosui.cpp	2012-11-21 21:08:01.000000000 +0900
+@@ -108,7 +108,7 @@
+ 			}else{
+ 				inifile=param;
+ 				wstring wini=ctow(inifile);
+-				unsigned int pos=wini.rfind((wchar_t)'/');
++				wstring::size_type pos=wini.rfind((wchar_t)'/');
+ 				if(pos==string::npos) pos=wini.rfind((wchar_t)'\\');
+ 				if(pos!=string::npos)
+ 					datapath=CanonicalPath(wtoc(wini.substr(0,pos+1)));

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: