fixes for kde-3.1

6 files changed, 6 insertions, 137 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index b6cf368db74b..9f5781091f40 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.42 2003/01/08 21:45:57 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.43 2003/01/15 01:23:01 hannes Exp $
+
+  14 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild:
+  fixes for kde-3.1 (removed unneeded patches)
 
   08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdelibs-3.1_rc6.ebuild:
   added ~ppc to keywords
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1 b/kde-base/kdelibs/files/digest-kdelibs-3.1
index 78443f6cbc03..39bfcd29b0b3 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.1
@@ -1 +1 @@
-MD5 72eae85bbd4a5a270d8d44dc351373c4 kdelibs-3.1.tar.bz2 10380078
+MD5 f36683ce077043aeee12d258733efe81 kdelibs-3.1.tar.bz2 10375258
diff --git a/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch b/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch
deleted file mode 100644
index e4a0ba03dbe1..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-cvs -f log -N -r1.39 kimageeffect.cpp
-
-RCS file: /home/kde/kdelibs/kdefx/kimageeffect.cpp,v
-Working file: kimageeffect.cpp
-head: 1.39
-branch:
-locks: strict
-access list:
-keyword substitution: kv
-total revisions: 40;	selected revisions: 1
-description:
-----------------------------
-revision 1.39
-date: 2002/12/02 08:47:13;  author: staikos;  state: Exp;  lines: +14 -1
-Make blendOnLower() work on big endian systems.
-=============================================================================
-cvs -f diff -bp -u -r1.38 -r1.39 kimageeffect.cpp
-Index: kimageeffect.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/kdefx/kimageeffect.cpp,v
-retrieving revision 1.38
-retrieving revision 1.39
-diff -b -p -u -r1.38 -r1.39
---- kdefx/kimageeffect.cpp	2002/07/31 22:52:45	1.38
-+++ kdefx/kimageeffect.cpp	2002/12/02 08:47:13	1.39
-@@ -1958,11 +1958,16 @@ bool KImageEffect::blendOnLower(
-     --b; --i;
-     do
-     {
-+#ifndef WORDS_BIGENDIAN
-       while ( !(a=*i) && k>0 )
-+#else
-+      while ( !(a=*(i-3)) && k>0 )
-+#endif
-       {
-         i-=4; b-=4; k--;
-       };
- 
-+#ifndef WORDS_BIGENDIAN
-       --i; --b;
-       *b += ( ((*i - *b) * a) >> 8 );
-       --i; --b;
-@@ -1970,6 +1975,14 @@ bool KImageEffect::blendOnLower(
-       --i; --b;
-       *b += ( ((*i - *b) * a) >> 8 );
-       --i; --b;
-+#else
-+      *b += ( ((*i - *b) * a) >> 8 );
-+      --i; --b;
-+      *b += ( ((*i - *b) * a) >> 8 );
-+      --i; --b;
-+      *b += ( ((*i - *b) * a) >> 8 );
-+      i -= 2; b -= 2;
-+#endif
-     } while (k--);
-   }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-3.1-kmdcodec.patch b/kde-base/kdelibs/files/kdelibs-3.1-kmdcodec.patch
deleted file mode 100644
index 077f73016b02..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1-kmdcodec.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-cvs -f log -N -r1.57 kmdcodec.cpp
-
-RCS file: /home/kde/kdelibs/kdecore/kmdcodec.cpp,v
-Working file: kmdcodec.cpp
-head: 1.57
-branch:
-locks: strict
-access list:
-keyword substitution: kv
-total revisions: 59;	selected revisions: 1
-description:
-----------------------------
-revision 1.57
-date: 2002/12/02 07:07:35;  author: staikos;  state: Exp;  lines: +4 -4
-Hello, we like this to work on big endian too
-
--    //encode (bits, m_count, 8);
--    memcpy( bits, m_count, 8 );
-+    encode (bits, m_count, 8);
-+    //memcpy( bits, m_count, 8 );
-
-(etc)
-
-This is a critical fix for big endian systems.
-=============================================================================
-cvs -f diff -bp -u -r1.56 -r1.57 kmdcodec.cpp
-Index: kmdcodec.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/kdecore/kmdcodec.cpp,v
-retrieving revision 1.56
-retrieving revision 1.57
-diff -b -p -u -r1.56 -r1.57
---- kdecore/kmdcodec.cpp	2002/07/31 20:57:27	1.56
-+++ kdecore/kmdcodec.cpp	2002/12/02 07:07:35	1.57
-@@ -845,8 +845,8 @@ void KMD5::finalize ()
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-     };
- 
--    //encode (bits, m_count, 8);
--    memcpy( bits, m_count, 8 );
-+    encode (bits, m_count, 8);
-+    //memcpy( bits, m_count, 8 );
- 
-     // Pad out to 56 mod 64.
-     index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3f);
-@@ -857,8 +857,8 @@ void KMD5::finalize ()
-     update (reinterpret_cast<const char*>(bits), 8);
- 
-     // Store state in digest
--    //encode (m_digest, m_state, 16);
--    memcpy( m_digest, m_state, 16 );
-+    encode (m_digest, m_state, 16);
-+    //memcpy( m_digest, m_state, 16 );
- 
-     // Fill sensitive information with zero's
-     memset ( (void *)m_buffer, 0, sizeof(*m_buffer));
diff --git a/kde-base/kdelibs/files/kdelibs-3.1-ssl.patch b/kde-base/kdelibs/files/kdelibs-3.1-ssl.patch
deleted file mode 100644
index 7771b0a7586f..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1-ssl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kio/kssl/ksslcertificate.cc~	2002-12-03 16:41:23.000000000 +0100
-+++ kio/kssl/ksslcertificate.cc	2002-12-03 16:42:12.000000000 +0100
-@@ -513,6 +513,7 @@
- int KSSLCertificate::purposeToOpenSSL(KSSLCertificate::KSSLPurpose p) const {
- int rc = 0;
- 
-+#ifdef HAVE_SSL
- 	if (p == KSSLCertificate::SSLServer) {
- 		rc = X509_PURPOSE_SSL_SERVER;
- 	} else if (p == KSSLCertificate::SSLClient) {
-@@ -524,6 +525,7 @@
- 	} else if (p == KSSLCertificate::Any) {
- 		rc = X509_PURPOSE_ANY;
- 	}
-+#endif
- 
- return rc;	
- }
diff --git a/kde-base/kdelibs/kdelibs-3.1.ebuild b/kde-base/kdelibs/kdelibs-3.1.ebuild
index 6d9a0b2d3623..ee9e21647ee2 100644
--- a/kde-base/kdelibs/kdelibs-3.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.ebuild,v 1.11 2003/01/07 08:24:20 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.ebuild,v 1.12 2003/01/15 01:23:01 hannes Exp $
 inherit kde kde.org 
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
 # check need for glib >=1.3.3 (we have 1.2.10 only; configure has no glib flag but searches for it)
 
-PATCHES="${FILESDIR}/${P}-kimageeffect.patch
-	${FILESDIR}/${P}-kmdcodec.patch
-	${FILESDIR}/${P}-ssl.patch"
 DESCRIPTION="KDE libraries needed by all kde programs" 
 KEYWORDS="x86 ppc"
 HOMEPAGE="http//www.kde.org/"