qt3, maj des dépendances et suppression fichiers obsolètes

8 files changed, 1 insertions, 344 deletions

diff --git a/kde3/kdebase3/kdebase-3.5.10-crypto-1.patch b/kde3/kdebase3/kdebase-3.5.10-crypto-1.patch
deleted file mode 100644
index 9568cffca..000000000
--- a/kde3/kdebase3/kdebase-3.5.10-crypto-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- kdebase-3.5.10-original/kcontrol/crypto/crypto.cpp	2006-10-01 19:31:49.000000000 +0200
-+++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2010-09-28 21:42:18.000000000 +0200
-@@ -2321,7 +2321,7 @@
- unsigned int i;
- SSL_CTX *ctx;
- SSL *ssl;
--SSL_METHOD *meth;
-+const SSL_METHOD *meth;
- 
-   SSLv2Box->clear();
-   SSLv3Box->clear();
-@@ -2337,7 +2337,7 @@
-   CipherItem *item;
-   for (i=0; ; i++) {
-     int j, k;
--    SSL_CIPHER *sc;
-+    const SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
-@@ -2365,7 +2365,7 @@
- 
-   for (i=0; ; i++) {
-     int j, k;
--    SSL_CIPHER *sc;
-+    const SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
diff --git a/kde3/kdebase3/kdebase-3.5.10-gcc44-1.patch b/kde3/kdebase3/kdebase-3.5.10-gcc44-1.patch
deleted file mode 100644
index 144b45561..000000000
--- a/kde3/kdebase3/kdebase-3.5.10-gcc44-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp    2005/12/02 23:52:28     485133
-+++ kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp    2009/05/30 00:34:35     975372
-@@ -44,7 +44,7 @@
-
- using namespace std;
-
--static char * findSpace(char *str)
-+static const char * findSpace(const char *str)
- {
-     while(str && *str!=' ' && *str!='\t')
-         str++;
-@@ -65,7 +65,7 @@
-     char a[constMaxLen+1],
-          b[constFileMaxLen+1];
-
--    char *slash1=strchr(line, '/'),
-+    const char *slash1=strchr(line, '/'),
-          *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
-          *ob=slash1 ? strchr(slash1, '(') : NULL,
-          *cb=ob ? strchr(ob, ')') : NULL,
-
diff --git a/kde3/kdelibs3/kdelibs-3.5.10-gcc44-1.patch b/kde3/kdelibs3/kdelibs-3.5.10-gcc44-1.patch
deleted file mode 100644
index f04f2ca8c..000000000
--- a/kde3/kdelibs3/kdelibs-3.5.10-gcc44-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream URL: https://bugs.kde.org/show_bug.cgi?id=193242
-Signed off by: Elan Ruusamäe <glen@delfi.ee>
---- kdelibs-3.5.10/kioslave/ftp/ftp.cc~ 2009-05-19 14:57:21.000000000 +0300
-+++ kdelibs-3.5.10/kioslave/ftp/ftp.cc  2009-05-19 14:57:24.016475767 +0300
-@@ -876,5 +876,5 @@
-   // 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 )
-@@ -931,7 +931,7 @@
-     return ERR_INTERNAL;
-   }
-
--  char *start = strchr(ftpResponse(3), '|');
-+  const char *start = strchr(ftpResponse(3), '|');
-   if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
-     return ERR_INTERNAL;
diff --git a/kde3/kdelibs3/kdelibs-3.5.10-gcc45-1.patch b/kde3/kdelibs3/kdelibs-3.5.10-gcc45-1.patch
deleted file mode 100644
index ca1df884c..000000000
--- a/kde3/kdelibs3/kdelibs-3.5.10-gcc45-1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kdelibs-3.5.10-original/kate/part/katehighlight.cpp	2007-05-14 09:52:27.000000000 +0200
-+++ kdelibs-3.5.10/kate/part/katehighlight.cpp	2010-09-28 17:21:27.000000000 +0200
-@@ -3225,7 +3225,7 @@
-   list.append(charAttribute);
- 
-   KateAttribute* string = new KateAttribute();
--  string->setTextColor(QColor::QColor("#D00"));
-+  string->setTextColor(QColor("#D00"));
-   string->setSelectedTextColor(Qt::red);
-   list.append(string);
- 
-@@ -3242,9 +3242,9 @@
- 
-   KateAttribute* alert = new KateAttribute();
-   alert->setTextColor(Qt::black);
--  alert->setSelectedTextColor( QColor::QColor("#FCC") );
-+  alert->setSelectedTextColor( QColor("#FCC") );
-   alert->setBold(true);
--  alert->setBGColor( QColor::QColor("#FCC") );
-+  alert->setBGColor( QColor("#FCC") );
-   list.append(alert);
- 
-   KateAttribute* functionAttribute = new KateAttribute();
diff --git a/kde3/kdelibs3/kdelibs-3.5.10-openssl-1.patch b/kde3/kdelibs3/kdelibs-3.5.10-openssl-1.patch
deleted file mode 100644
index 6b9f1d4c3..000000000
--- a/kde3/kdelibs3/kdelibs-3.5.10-openssl-1.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
-
diff --git a/kde3/qt3-devel/qt-3.3.8b-png14-1.patch b/kde3/qt3-devel/qt-3.3.8b-png14-1.patch
deleted file mode 100644
index b445c254f..000000000
--- a/kde3/qt3-devel/qt-3.3.8b-png14-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur qt-x11-free-3.3.8b-original/src/kernel/qpngio.cpp qt-x11-free-3.3.8b/src/kernel/qpngio.cpp
---- qt-x11-free-3.3.8b-original/src/kernel/qpngio.cpp	2008-01-15 20:09:13.000000000 +0100
-+++ qt-x11-free-3.3.8b/src/kernel/qpngio.cpp	2010-09-28 11:04:28.000000000 +0200
-@@ -162,7 +162,7 @@
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr->trans_color.gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -190,7 +190,7 @@
- 		    info_ptr->palette[i].red,
- 		    info_ptr->palette[i].green,
- 		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr->trans_alpha[i]
- 		    )
- 		);
- 		i++;
-@@ -324,9 +324,10 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
-     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- 	QRgb trans = 0xFF000000 | qRgb(
--	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+             (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+             (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+             (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
-+
- 	for (uint y=0; y<height; y++) {
- 	    for (uint x=0; x<info_ptr->width; x++) {
- 		if (((uint**)jt)[y][x] == trans) {
diff --git a/kde3/qt3/Pkgfile b/kde3/qt3/Pkgfile
index e2718806c..460eaa3d4 100644
--- a/kde3/qt3/Pkgfile
+++ b/kde3/qt3/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://trolltech.com/products/qt/qt3
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg, libcups, qt3-devel
+# Depends on: xorg, libcups
 
 name=qt3
 version=3.3.8b
diff --git a/kde3/qt3/qt-3.3.8b-png14-1.patch b/kde3/qt3/qt-3.3.8b-png14-1.patch
deleted file mode 100644
index b445c254f..000000000
--- a/kde3/qt3/qt-3.3.8b-png14-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur qt-x11-free-3.3.8b-original/src/kernel/qpngio.cpp qt-x11-free-3.3.8b/src/kernel/qpngio.cpp
---- qt-x11-free-3.3.8b-original/src/kernel/qpngio.cpp	2008-01-15 20:09:13.000000000 +0100
-+++ qt-x11-free-3.3.8b/src/kernel/qpngio.cpp	2010-09-28 11:04:28.000000000 +0200
-@@ -162,7 +162,7 @@
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr->trans_color.gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -190,7 +190,7 @@
- 		    info_ptr->palette[i].red,
- 		    info_ptr->palette[i].green,
- 		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr->trans_alpha[i]
- 		    )
- 		);
- 		i++;
-@@ -324,9 +324,10 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
-     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- 	QRgb trans = 0xFF000000 | qRgb(
--	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+             (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+             (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+             (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
-+
- 	for (uint y=0; y<height; y++) {
- 	    for (uint x=0; x<info_ptr->width; x++) {
- 		if (((uint**)jt)[y][x] == trans) {