Author: pebender
Date: Tue Jun 23 08:04:11 2009
New Revision: 5026
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-strchr.patch
Modified:
trunk/gar-minimyth/script/kde/kdelibs/Makefile
trunk/gar-minimyth/script/kde/kdelibs/checksums
Log:
- Patched kde/kdelibs so that it compiles against the new strchr prototype.
Modified: trunk/gar-minimyth/script/kde/kdelibs/Makefile
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/Makefile (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/Makefile Tue Jun 23 08:04:11 2009
@@ -3,7 +3,7 @@
CATEGORIES = kde
MASTER_SITES = ftp://ftp.kde.org/pub/kde/stable/$(GARVERSION)/src/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-kab2kabc_dependencies.patch
$(DISTNAME)-inotify_h.patch $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-kab2kabc_dependencies.patch
$(DISTNAME)-inotify_h.patch $(DISTNAME)-strchr.patch $(DISTNAME).patch.gar
ifneq ($(DESTIMG),build)
PATCHFILES += $(DISTNAME)-cross.patch.gar
endif
Modified: trunk/gar-minimyth/script/kde/kdelibs/checksums
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/checksums (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/checksums Tue Jun 23 08:04:11 2009
@@ -1,5 +1,6 @@
43cd55ed15f63b5738d620ef9f9fd568 download/kdelibs-3.5.10.tar.bz2
f6901aa9dada820db40ff083a1935ce7
download/kdelibs-3.5.10-kab2kabc_dependencies.patch
c53e6b75b319875ba12ddfdf04f531de download/kdelibs-3.5.10-inotify_h.patch
+dfb8b83784b18cff30b18e466afd517c download/kdelibs-3.5.10-strchr.patch
51622294b6b66992ac7c910fb7a6f17d download/kdelibs-3.5.10.patch.gar
8bf0b7c09ba456688fa8d307ebf7761c download/kdelibs-3.5.10-cross.patch.gar
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-strchr.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-strchr.patch
Tue Jun 23 08:04:11 2009
@@ -0,0 +1,24 @@
+diff -Naur kdelibs-3.5.10-old/kioslave/ftp/ftp.cc
kdelibs-3.5.10-new/kioslave/ftp/ftp.cc
+--- kdelibs-3.5.10-old/kioslave/ftp/ftp.cc 2008-08-19 11:18:12.000000000
-0700
++++ kdelibs-3.5.10-new/kioslave/ftp/ftp.cc 2009-06-23 07:51:19.000000000
-0700
+@@ -876,9 +876,9 @@
+ // The usual answer is '227 Entering Passive Mode.
(160,39,200,55,6,245)'
+ // but anonftpd gives '227 =160,39,200,55,6,245'
+ int i[6];
+- char *start = strchr(ftpResponse(3), '(');
++ char *start = strchr((char *)ftpResponse(3), '(');
+ if ( !start )
+- start = strchr(ftpResponse(3), '=');
++ start = strchr((char *)ftpResponse(3), '=');
+ if ( !start ||
+ ( sscanf(start, "(%d,%d,%d,%d,%d,%d)",&i[0], &i[1], &i[2], &i[3],
&i[4], &i[5]) != 6 &&
+ sscanf(start, "=%d,%d,%d,%d,%d,%d", &i[0], &i[1], &i[2], &i[3],
&i[4], &i[5]) != 6 ) )
+@@ -931,7 +931,7 @@
+ return ERR_INTERNAL;
+ }
+
+- char *start = strchr(ftpResponse(3), '|');
++ char *start = strchr((char *)ftpResponse(3), '|');
+ if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
+ return ERR_INTERNAL;
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
