Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b93b058c892cf4b03be06a68aaec60386454c8d
commit 4b93b058c892cf4b03be06a68aaec60386454c8d Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Aug 9 14:33:44 2009 +0200 d4x-2.5.7.1-5-i686 - add index-const.patch for #3869 diff --git a/source/xapps-extra/d4x/FrugalBuild b/source/xapps-extra/d4x/FrugalBuild index 5901664..288d651 100644 --- a/source/xapps-extra/d4x/FrugalBuild +++ b/source/xapps-extra/d4x/FrugalBuild @@ -4,7 +4,7 @@ pkgname=d4x pkgver=2.5.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="Download manager for Linux" url="http://www.krasu.ru/soft/chuchelo/"; depends=('gtk+2' 'atk' 'openssl' 'libstdc++' 'freetype2' 'pango' 'cairo') @@ -13,9 +13,10 @@ groups=('xapps-extra') options=('scriptlet') archs=('i686' 'x86_64') up2date="lynx -dump http://www.krasu.ru/soft/chuchelo/|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2 gtk2-compile.patch) +source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2 gtk2-compile.patch index-const.patch) sha1sums=('10955550112bdf22ff91c6c9395afd1a5f15bff2' \ - '5020e0ea3027c4eae877c702b52f360047dbd8f8') + '5020e0ea3027c4eae877c702b52f360047dbd8f8' \ + '11e53a65a2c3187db80a28e25b2ecb8845f2fac4') build () { diff --git a/source/xapps-extra/d4x/index-const.patch b/source/xapps-extra/d4x/index-const.patch new file mode 100644 index 0000000..2c96404 --- /dev/null +++ b/source/xapps-extra/d4x/index-const.patch @@ -0,0 +1,100 @@ +diff --git a/main/face/edit.cc b/main/face/edit.cc +index b1cbd97..376d8fb 100644 +--- a/main/face/edit.cc ++++ b/main/face/edit.cc +@@ -1450,7 +1450,7 @@ static void proxy_toggle_socks(GtkWidget *parent,tProxyWidget *where) { + + static void _proxy_port_changed_(GtkEntry *entry,GtkEntry *entryh){ + const char *tmp=gtk_entry_get_text(entryh); +- char *tmp1=index(tmp,':'); ++ char *tmp1=(char*)index(tmp,':'); + if (tmp1){ + *tmp1=0; + char *ns=sum_strings(tmp,":",gtk_entry_get_text(entry),NULL); +diff --git a/main/ftp.cc b/main/ftp.cc +index 0a12bf2..72b0a23 100644 +--- a/main/ftp.cc ++++ b/main/ftp.cc +@@ -261,7 +261,7 @@ int tFtpClient::connect() { + }; + + static void d4x_ftp_parse_pasv(const char *str,int args[]){ +- char *a=index(str,'('); ++ char *a=(char*)index(str,'('); + if (a==NULL) return; + a+=1; + int i=0; +diff --git a/main/html.cc b/main/html.cc +index 8b096c3..526c68d 100644 +--- a/main/html.cc ++++ b/main/html.cc +@@ -700,7 +700,7 @@ void tHtmlParser::look_for_meta_content(tHtmlTagField *where, + + void tHtmlParser::set_content_type(const char *ct){ + //Example: text/html; charset=koi8-r +- char *a=index(ct,'='); ++ char *a=(char*)index(ct,'='); + if (a) codepage=a+1; + }; + +diff --git a/main/locstr.cc b/main/locstr.cc +index 0760851..6753ca3 100644 +--- a/main/locstr.cc ++++ b/main/locstr.cc +@@ -281,7 +281,7 @@ char *index_mult(char *str,const char *what){ + DBC_RETVAL_IF_FAIL(str!=NULL,NULL); + DBC_RETVAL_IF_FAIL(what!=NULL,NULL); + while (*str){ +- char *a=index(what,*str); ++ char *a=(char*)index(what,*str); + if (a) return(str); + str++; + }; +@@ -472,7 +472,7 @@ std::string unhexed_string(const std::string &str){ + char *escape_char(const char *where,char what,char bywhat){ + DBC_RETVAL_IF_FAIL(where!=NULL,NULL); + int num=0; +- char *tmp=index(where,what); ++ char *tmp=(char*)index(where,what); + while(tmp){ + num+=1; + tmp=index(tmp+1,what); +@@ -481,7 +481,7 @@ char *escape_char(const char *where,char what,char bywhat){ + char *rvalue=new char[strlen(where)+num*2+1]; + *rvalue=0; + char *r=rvalue; +- tmp=index(where,what); ++ tmp=(char*)index(where,what); + while(tmp){ + if (tmp-where) + memcpy(r,where,tmp-where); +@@ -490,7 +490,7 @@ char *escape_char(const char *where,char what,char bywhat){ + r[1]=what; + r+=2; + where=tmp+1; +- tmp=index(where,what); ++ tmp=(char*)index(where,what); + }; + *r=0; + if (*where) +@@ -962,17 +962,17 @@ char *subtract_path(const char *a,const char *b){ + DBC_RETVAL_IF_FAIL(a!=NULL,NULL); + DBC_RETVAL_IF_FAIL(b!=NULL,NULL); + int i=0; +- char *temp=index(b,'/'); ++ char *temp=(char*)index(b,'/'); + while (temp){ + while (*temp=='/') temp+=1; + temp=index(temp,'/'); + i+=1; + }; + i-=1; +- temp=rindex(a,'/'); ++ temp=(char*)rindex(a,'/'); + while (temp && i>0){ + *temp=0; +- char *tmp=rindex(a,'/'); ++ char *tmp=(char*)rindex(a,'/'); + *temp='/'; + temp=tmp; + i-=1; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
