[arch-commits] Commit in d4x/repos (3 files)

[Giovanni Scafora]

    Date: Monday, October 19, 2009 @ 05:21:55
  Author: giovanni
Revision: 56080

Merged revisions 56039,56078 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/d4x/trunk

........
  r56039 | hugo | 2009-10-18 07:37:05 -0700 (dom, 18 ott 2009) | 2 lines
  
  upgpkg: d4x 2.5.7.1-3
      Fixing FS#16170
........
  r56078 | giovanni | 2009-10-19 02:20:10 -0700 (lun, 19 ott 2009) | 1 line
........

Added:
  d4x/repos/extra-x86_64/d4x-fix-gcc44.patch
    (from rev 56078, d4x/trunk/d4x-fix-gcc44.patch)
Modified:
  d4x/repos/extra-x86_64/	(properties)
  d4x/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   12 ++++--
 d4x-fix-gcc44.patch |   98 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 4 deletions(-)


Property changes on: d4x/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /d4x/trunk:1-6268
   + /d4x/trunk:1-56079

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-19 09:21:05 UTC (rev 56079)
+++ extra-x86_64/PKGBUILD	2009-10-19 09:21:55 UTC (rev 56080)
@@ -3,23 +3,27 @@
 
 pkgname=d4x
 pkgver=2.5.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A GUI XFree86 program for downloading files"
 arch=('i686' 'x86_64')
-depends=('esd' 'gtk2' 'openssl<=0.9.8' 'alsa-lib' 'libstdc++5' 'audiofile') 
+depends=('esound' 'gtk2' 'openssl<=0.9.8' 'alsa-lib' 'libstdc++5' 'audiofile') 
 options=('!makeflags')
-source=(http://d4x.krasu.ru/files/${pkgname}-${pkgver}.tar.bz2 d4x-gtkurl.patch)
-md5sums=('68d6336c3749a7caabb0f5a5f84f4102' '3639f6d3fb7253a50a085c0b1037268b')
+source=(http://repository.slacky.eu/slackware-12.2/network/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+	d4x-fix-gcc44.patch d4x-gtkurl.patch)
 url="http://www.krasu.ru/soft/chuchelo/"
 license=('PerlArtistic')
 makedepends=('boost')
 conflicts=('downloaderx')
 replaces=('downloaderx')
+md5sums=('68d6336c3749a7caabb0f5a5f84f4102'
+         '49541b12908520f131a22d31a37d4a59'
+         '3639f6d3fb7253a50a085c0b1037268b')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
     
     patch -Np1 < ${srcdir}/d4x-gtkurl.patch || return 1
+    patch -Np1 -i "$srcdir"/d4x-fix-gcc44.patch || return 1
     
     ./configure --prefix=/usr --mandir=/usr/share/man
     make || return 1

Copied: d4x/repos/extra-x86_64/d4x-fix-gcc44.patch (from rev 56078, d4x/trunk/d4x-fix-gcc44.patch)
===================================================================
--- extra-x86_64/d4x-fix-gcc44.patch	                        (rev 0)
+++ extra-x86_64/d4x-fix-gcc44.patch	2009-10-19 09:21:55 UTC (rev 56080)
@@ -0,0 +1,98 @@
+diff -ruN d4x.orig/main/face/edit.cc d4x.new/main/face/edit.cc
+--- d4x.orig/main/face/edit.cc	2009-05-29 02:35:26.000000000 -0700
++++ d4x.new/main/face/edit.cc	2009-05-29 02:33:45.000000000 -0700
+@@ -1450,7 +1450,7 @@
+ 
+ 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 -ruN d4x.orig/main/ftp.cc d4x.new/main/ftp.cc
+--- d4x.orig/main/ftp.cc	2009-05-29 02:35:02.000000000 -0700
++++ d4x.new/main/ftp.cc	2009-05-29 02:32:41.000000000 -0700
+@@ -261,7 +261,7 @@
+ };
+ 
+ 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 -ruN d4x.orig/main/html.cc d4x.new/main/html.cc
+--- d4x.orig/main/html.cc	2009-05-29 02:35:09.000000000 -0700
++++ d4x.new/main/html.cc	2009-05-29 02:33:55.000000000 -0700
+@@ -700,7 +700,7 @@
+ 
+ void tHtmlParser::set_content_type(const char *ct){
+ 	//Example: text/html; charset=koi8-r
+-	char *a=index(ct,'=');
++	const char *a=index(ct,'=');
+ 	if (a) codepage=a+1;
+ };
+ 
+diff -ruN d4x.orig/main/locstr.cc d4x.new/main/locstr.cc
+--- d4x.orig/main/locstr.cc	2009-05-29 02:35:14.000000000 -0700
++++ d4x.new/main/locstr.cc	2009-05-29 02:32:47.000000000 -0700
+@@ -281,7 +281,7 @@
+ 	DBC_RETVAL_IF_FAIL(str!=NULL,NULL);
+ 	DBC_RETVAL_IF_FAIL(what!=NULL,NULL);
+ 	while (*str){
+-		char *a=index(what,*str);
++		const char *a=index(what,*str);
+ 		if (a) return(str);
+ 		str++;
+ 	};
+@@ -472,16 +472,16 @@
+ 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);
++		tmp = (char *) index(tmp+1,what);
+ 	};
+ 	if (num){
+ 		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 @@
+ 			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 @@
+ 	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;