patches for big endian people

4 files changed, 129 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index f874e0c10b9c..82df2df4af40 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.28 2002/11/30 12:28:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.29 2002/12/03 00:12:35 hannes Exp $
+
+  02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild:
+  added two patches for big endian (from kde-packagers list)
 
   30 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch b/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch
new file mode 100644
index 000000000000..4e4aaf860a42
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1-kimageeffect.patch
@@ -0,0 +1,66 @@
+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
+@@ -27,7 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ 
+ */
+ 
+-// $Id: kdelibs-3.1-kimageeffect.patch,v 1.1 2002/12/03 00:12:35 hannes Exp $
++// $Id: kdelibs-3.1-kimageeffect.patch,v 1.1 2002/12/03 00:12:35 hannes Exp $
+ 
+ #include <math.h>
+ 
+@@ -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
new file mode 100644
index 000000000000..077f73016b02
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1-kmdcodec.patch
@@ -0,0 +1,56 @@
+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/kdelibs-3.1.ebuild b/kde-base/kdelibs/kdelibs-3.1.ebuild
index bc4b8f3ce2bf..d750714c4c3a 100644
--- a/kde-base/kdelibs/kdelibs-3.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.ebuild
@@ -1,11 +1,13 @@
 # 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.5 2002/12/02 19:57:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.ebuild,v 1.6 2002/12/03 00:12:35 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"
 DESCRIPTION="KDE libraries needed by all kde programs" 
 KEYWORDS="x86"
 HOMEPAGE="http//www.kde.org/"