Author: glen Date: Mon Feb 15 14:07:11 2010 GMT Module: packages Tag: HEAD ---- Log message: - raw from http://svn.cross-lfs.org/svn/repos/patches/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch
---- Files affected: packages/kdelibs: kdelibs-3.5.10-gcc_4.4-2.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch diff -u /dev/null packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch:1.1 --- /dev/null Mon Feb 15 15:07:11 2010 +++ packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch Mon Feb 15 15:07:06 2010 @@ -0,0 +1,521 @@ +Submitted By: Michael (rabenkind at selfservix dot org) +Date: 2009-07-15 +Initial Package Version: 3.5.10 +Origin: http://de-mirror.org/distro/frugalware/frugalware-current/source/kde/kdelibs/ +Upstream Status: Unknown +Description: Fix compilation with gcc-4.4 + +diff -up kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig kdelibs-3.5.10/kioslave/ftp/ftp.cc +--- kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig 2009-02-25 13:18:13.000000000 +0100 ++++ kdelibs-3.5.10/kioslave/ftp/ftp.cc 2009-02-25 13:34:13.000000000 +0100 +@@ -876,7 +876,7 @@ int Ftp::ftpOpenPASVDataConnection() + // 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), '('); ++ const char *start = strchr(ftpResponse(3), '('); + if ( !start ) + start = strchr(ftpResponse(3), '='); + if ( !start || +@@ -931,7 +931,7 @@ int Ftp::ftpOpenEPSVDataConnection() + return ERR_INTERNAL; + } + +- char *start = strchr(ftpResponse(3), '|'); ++ const char *start = strchr(ftpResponse(3), '|'); + if ( !start || sscanf(start, "|||%d|", &portnum) != 1) + return ERR_INTERNAL; + +--- kdelibs-3.5.10/kjs/dtoa.cpp.orig 2009-05-26 17:20:54.673539511 +0200 ++++ kdelibs-3.5.10/kjs/dtoa.cpp 2009-05-26 17:24:20.117023777 +0200 +@@ -207,11 +207,7 @@ typedef unsigned Long ULong; + #endif + + #ifdef MALLOC +-#ifdef KR_headers +-extern char *MALLOC(); +-#else + extern void *MALLOC(size_t); +-#endif + #else + #define MALLOC malloc + #endif +@@ -273,12 +269,8 @@ extern "C" { + #endif + + #ifndef CONST +-#ifdef KR_headers +-#define CONST /* blank */ +-#else + #define CONST const + #endif +-#endif + + #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1 + Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined. +@@ -286,37 +278,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA + + typedef union { double d; ULong L[2]; } U; + +-#ifdef YES_ALIAS +-#define dval(x) x ++#define dval(x) (x).d + #ifdef IEEE_8087 +-#define word0(x) ((ULong *)&x)[1] +-#define word1(x) ((ULong *)&x)[0] ++#define word0(x) (x).L[1] ++#define word1(x) (x).L[0] + #else +-#define word0(x) ((ULong *)&x)[0] +-#define word1(x) ((ULong *)&x)[1] +-#endif +-#else +-#ifdef IEEE_8087 +-#define word0(x) ((U*)&x)->L[1] +-#define word1(x) ((U*)&x)->L[0] +-#else +-#define word0(x) ((U*)&x)->L[0] +-#define word1(x) ((U*)&x)->L[1] +-#endif +-#define dval(x) ((U*)&x)->d ++#define word0(x) (x).L[0] ++#define word1(x) (x).L[1] + #endif + + /* The following definition of Storeinc is appropriate for MIPS processors. + * An alternative that might be better on some machines is +- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) + */ +-#if defined(IEEE_8087) + defined(VAX) +-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ +-((unsigned short *)a)[0] = (unsigned short)c, a++) +-#else +-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \ +-((unsigned short *)a)[1] = (unsigned short)c, a++) +-#endif ++#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) + + /* #define P DBL_MANT_DIG */ + /* Ten_pmax = floor(P*log(2)/log(5)) */ +@@ -440,11 +414,7 @@ typedef union { double d; ULong L[2]; } + #ifdef RND_PRODQUOT + #define rounded_product(a,b) a = rnd_prod(a, b) + #define rounded_quotient(a,b) a = rnd_quot(a, b) +-#ifdef KR_headers +-extern double rnd_prod(), rnd_quot(); +-#else + extern double rnd_prod(double, double), rnd_quot(double, double); +-#endif + #else + #define rounded_product(a,b) a *= b + #define rounded_quotient(a,b) a /= b +@@ -457,11 +427,7 @@ extern double rnd_prod(double, double), + #define Pack_32 + #endif + +-#ifdef KR_headers +-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff) +-#else + #define FFFFFFFF 0xffffffffUL +-#endif + + #ifdef NO_LONG_LONG + #undef ULLong +@@ -502,11 +468,7 @@ Bigint { + + static Bigint * + Balloc +-#ifdef KR_headers +- (k) int k; +-#else + (int k) +-#endif + { + int x; + Bigint *rv; +@@ -542,11 +504,7 @@ Balloc + + static void + Bfree +-#ifdef KR_headers +- (v) Bigint *v; +-#else + (Bigint *v) +-#endif + { + if (v) { + ACQUIRE_DTOA_LOCK(0); +@@ -561,11 +519,7 @@ y->wds*sizeof(Long) + 2*sizeof(int)) + + static Bigint * + multadd +-#ifdef KR_headers +- (b, m, a) Bigint *b; int m, a; +-#else + (Bigint *b, int m, int a) /* multiply by m and add a */ +-#endif + { + int i, wds; + #ifdef ULLong +@@ -618,11 +572,7 @@ multadd + + static Bigint * + s2b +-#ifdef KR_headers +- (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9; +-#else + (CONST char *s, int nd0, int nd, ULong y9) +-#endif + { + Bigint *b; + int i, k; +@@ -656,11 +606,7 @@ s2b + + static int + hi0bits +-#ifdef KR_headers +- (x) register ULong x; +-#else + (register ULong x) +-#endif + { + register int k = 0; + +@@ -690,11 +636,7 @@ hi0bits + + static int + lo0bits +-#ifdef KR_headers +- (y) ULong *y; +-#else + (ULong *y) +-#endif + { + register int k; + register ULong x = *y; +@@ -738,11 +680,7 @@ lo0bits + + static Bigint * + i2b +-#ifdef KR_headers +- (i) int i; +-#else + (int i) +-#endif + { + Bigint *b; + +@@ -754,11 +692,7 @@ i2b + + static Bigint * + mult +-#ifdef KR_headers +- (a, b) Bigint *a, *b; +-#else + (Bigint *a, Bigint *b) +-#endif + { + Bigint *c; + int k, wa, wb, wc; +@@ -866,11 +800,7 @@ mult + + static Bigint * + pow5mult +-#ifdef KR_headers +- (b, k) Bigint *b; int k; +-#else + (Bigint *b, int k) +-#endif + { + Bigint *b1, *p5, *p51; + int i; +@@ -923,11 +853,7 @@ pow5mult + + static Bigint * + lshift +-#ifdef KR_headers +- (b, k) Bigint *b; int k; +-#else + (Bigint *b, int k) +-#endif + { + int i, k1, n, n1; + Bigint *b1; +@@ -983,11 +909,7 @@ lshift + + static int + cmp +-#ifdef KR_headers +- (a, b) Bigint *a, *b; +-#else + (Bigint *a, Bigint *b) +-#endif + { + ULong *xa, *xa0, *xb, *xb0; + int i, j; +@@ -1017,11 +939,7 @@ cmp + + static Bigint * + diff +-#ifdef KR_headers +- (a, b) Bigint *a, *b; +-#else + (Bigint *a, Bigint *b) +-#endif + { + Bigint *c; + int i, wa, wb; +@@ -1111,15 +1029,12 @@ diff + + static double + ulp +-#ifdef KR_headers +- (x) double x; +-#else +- (double x) +-#endif ++ (double dx) + { + register Long L; +- double a; ++ U x, a; + ++ dval(x) = dx; + L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1; + #ifndef Avoid_Underflow + #ifndef Sudden_Underflow +@@ -1153,15 +1068,11 @@ ulp + + static double + b2d +-#ifdef KR_headers +- (a, e) Bigint *a; int *e; +-#else + (Bigint *a, int *e) +-#endif + { + ULong *xa, *xa0, w, y, z; + int k; +- double d; ++ U d; + #ifdef VAX + ULong d0, d1; + #else +@@ -1223,12 +1134,9 @@ b2d + + static Bigint * + d2b +-#ifdef KR_headers +- (d, e, bits) double d; int *e, *bits; +-#else +- (double d, int *e, int *bits) +-#endif ++ (double dd, int *e, int *bits) + { ++ U d; + Bigint *b; + int de, k; + ULong *x, y, z; +@@ -1237,6 +1145,9 @@ d2b + #endif + #ifdef VAX + ULong d0, d1; ++#endif ++ dval(d) = dd; ++#ifdef VAX + d0 = word0(d) >> 16 | word0(d) << 16; + d1 = word1(d) >> 16 | word1(d) << 16; + #else +@@ -1361,13 +1272,9 @@ d2b + + static double + ratio +-#ifdef KR_headers +- (a, b) Bigint *a, *b; +-#else + (Bigint *a, Bigint *b) +-#endif + { +- double da, db; ++ U da, db; + int k, ka, kb; + + dval(da) = b2d(a, &ka); +@@ -1453,11 +1360,7 @@ static CONST double tinytens[] = { 1e-16 + + static int + match +-#ifdef KR_headers +- (sp, t) char **sp, *t; +-#else + (CONST char **sp, CONST char *t) +-#endif + { + int c, d; + CONST char *s = *sp; +@@ -1475,11 +1378,7 @@ match + #ifndef No_Hex_NaN + static void + hexnan +-#ifdef KR_headers +- (rvp, sp) double *rvp; CONST char **sp; +-#else +- (double *rvp, CONST char **sp) +-#endif ++ (U *rvp, CONST char **sp) + { + ULong c, x[2]; + CONST char *s; +@@ -1529,11 +1428,7 @@ hexnan + + double + kjs_strtod +-#ifdef KR_headers +- (s00, se) CONST char *s00; char **se; +-#else + (CONST char *s00, char **se) +-#endif + { + #ifdef Avoid_Underflow + int scale; +@@ -1541,7 +1436,8 @@ kjs_strtod + int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, + e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; + CONST char *s, *s0, *s1; +- double aadj, aadj1, adj, rv, rv0; ++ double aadj, aadj1, adj; ++ U aadj2, rv, rv0; + Long L; + ULong y, z; + Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL; +@@ -2302,7 +2198,9 @@ kjs_strtod + aadj = z; + aadj1 = dsign ? aadj : -aadj; + } +- word0(aadj1) += (2*P+1)*Exp_msk1 - y; ++ dval(aadj2) = aadj1; ++ word0(aadj2) += (2*P+1)*Exp_msk1 - y; ++ aadj1 = dval(aadj2); + } + adj = aadj1 * ulp(dval(rv)); + dval(rv) += adj; +@@ -2419,11 +2317,7 @@ kjs_strtod + + static int + quorem +-#ifdef KR_headers +- (b, S) Bigint *b, *S; +-#else + (Bigint *b, Bigint *S) +-#endif + { + int n; + ULong *bx, *bxe, q, *sx, *sxe; +@@ -2540,11 +2434,7 @@ quorem + #endif + + static char * +-#ifdef KR_headers +-rv_alloc(i) int i; +-#else + rv_alloc(int i) +-#endif + { + int j, k, *r; + +@@ -2563,11 +2453,7 @@ rv_alloc(int i) + } + + static char * +-#ifdef KR_headers +-nrv_alloc(s, rve, n) char *s, **rve; int n; +-#else + nrv_alloc(CONST char *s, char **rve, int n) +-#endif + { + char *rv, *t; + +@@ -2585,11 +2471,7 @@ nrv_alloc(CONST char *s, char **rve, int + */ + + void +-#ifdef KR_headers +-kjs_freedtoa(s) char *s; +-#else + kjs_freedtoa(char *s) +-#endif + { + Bigint *b = (Bigint *)((int *)s - 1); + b->maxwds = 1 << (b->k = *(int*)b); +@@ -2636,12 +2518,7 @@ kjs_freedtoa(char *s) + + char * + kjs_dtoa +-#ifdef KR_headers +- (d, mode, ndigits, decpt, sign, rve) +- double d; int mode, ndigits, *decpt, *sign; char **rve; +-#else +- (double d, int mode, int ndigits, int *decpt, int *sign, char **rve) +-#endif ++ (double dd, int mode, int ndigits, int *decpt, int *sign, char **rve) + { + /* Arguments ndigits, decpt, sign are similar to those + of ecvt and fcvt; trailing zeros are suppressed from +@@ -2686,7 +2563,8 @@ kjs_dtoa + ULong x; + #endif + Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S; +- double d2, ds, eps; ++ U d, d2, eps; ++ double ds; + char *s, *s0; + #ifdef Honor_FLT_ROUNDS + int rounding; +@@ -2702,6 +2580,7 @@ kjs_dtoa + } + #endif + ++ dval(d) = dd; + if (word0(d) & Sign_bit) { + /* set sign for everything, including 0's and NaNs */ + *sign = 1; + +--- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300 ++++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; + +diff -Naurp kdelibs-3.5.10/kio/kio/kdirwatch.cpp kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp +--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 ++++ kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp 2009-02-26 00:45:49.000000000 +0100 +@@ -71,22 +71,8 @@ + #include <linux/types.h> + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H +-#include <linux/inotify.h> ++#include <sys/inotify.h> + +-static inline int inotify_init (void) +-{ +- return syscall (__NR_inotify_init); +-} +- +-static inline int inotify_add_watch (int fd, const char *name, __u32 mask) +-{ +- return syscall (__NR_inotify_add_watch, fd, name, mask); +-} +- +-static inline int inotify_rm_watch (int fd, __u32 wd) +-{ +- return syscall (__NR_inotify_rm_watch, fd, wd); +-} + + #ifndef IN_ONLYDIR + #define IN_ONLYDIR 0x01000000 ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
