Properly fix weird blue tinting with a diff upstream patch #90547.

(Portage version: 2.0.51.20-r4)

4 files changed, 44 insertions, 44 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 49269882c2e4..599d5cf7d27b 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.29 2005/04/20 23:11:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.30 2005/04/26 23:20:36 vapier Exp $
+
+*eterm-0.9.3-r3 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  files/eterm-0.9.3-pixmap-colmod.patch, -eterm-0.9.3-r2.ebuild,
+  +eterm-0.9.3-r3.ebuild:
+  Properly fix weird blue tinting with a diff upstream patch #90547.
 
 *eterm-0.9.3-r2 (20 Apr 2005)
 
diff --git a/x11-terms/eterm/eterm-0.9.3-r2.ebuild b/x11-terms/eterm/eterm-0.9.3-r3.ebuild
index 9d0e04ab66e4..ca47d088ba86 100644
--- a/x11-terms/eterm/eterm-0.9.3-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r2.ebuild,v 1.1 2005/04/20 23:11:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r3.ebuild,v 1.1 2005/04/26 23:20:36 vapier Exp $
 
 inherit eutils
 
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.3-r2 b/x11-terms/eterm/files/digest-eterm-0.9.3-r3
index 099bf720b418..099bf720b418 100644
--- a/x11-terms/eterm/files/digest-eterm-0.9.3-r2
+++ b/x11-terms/eterm/files/digest-eterm-0.9.3-r3
diff --git a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
index 963281d1ebda..79f1abd53266 100644
--- a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
+++ b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
@@ -2,48 +2,41 @@ Patch taken from upstream cvs to fix funky blue tinting.
 
 --- src/pixmap.c
 +++ src/pixmap.c
-@@ -1649,12 +1649,12 @@
-                 int r, g, b;
+@@ -54,2 +54,7 @@
  
- # ifdef WORDS_BIGENDIAN
--                r = (ptr[x + 1] * rm) >> 8;
--                g = (ptr[x + 2] * gm) >> 8;
--                b = (ptr[x + 3] * bm) >> 8;
--                ptr[x + 1] = r;
--                ptr[x + 2] = g;
--                ptr[x + 3] = b;
-+                r = (ptr[x + 6] * rm) >> 8;
-+                g = (ptr[x + 5] * gm) >> 8;
-+                b = (ptr[x + 4] * bm) >> 8;
-+                ptr[x + 6] = r;
-+                ptr[x + 5] = g;
-+                ptr[x + 4] = b;
- # else
-                 r = (ptr[x + 2] * rm) >> 8;
-                 g = (ptr[x + 1] * gm) >> 8;
-@@ -1672,9 +1672,9 @@
-                 int r, g, b;
++/* FIXME:  Workaround for older versions of libast. */
++#ifndef WORDS_BIGENDIAN
++#  define WORDS_BIGENDIAN 0
++#endif
++
+ /* Assembler routines */
+@@ -1636,3 +1641,3 @@
  
- # ifdef WORDS_BIGENDIAN
--                r = (ptr[x + 1] * rm) >> 8;
--                g = (ptr[x + 2] * gm) >> 8;
--                b = (ptr[x + 3] * bm) >> 8;
-+                r = (ptr[x + 6] * rm) >> 8;
-+                g = (ptr[x + 5] * gm) >> 8;
-+                b = (ptr[x + 4] * bm) >> 8;
- # else
-                 r = (ptr[x + 2] * rm) >> 8;
-                 g = (ptr[x + 1] * gm) >> 8;
-@@ -1684,9 +1684,9 @@
-                 g |= (!(g >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 1] * rm) >> 8;
+@@ -1659,3 +1664,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 1] * rm) >> 8;
+@@ -1671,3 +1676,3 @@
+                 b |= (!(b >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 ptr[x + 1] = r;
+@@ -1701,3 +1706,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 0] * rm) >> 8;
+@@ -1724,3 +1729,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 0] * rm) >> 8;
+@@ -1736,3 +1741,3 @@
                  b |= (!(b >> 8) - 1);
- # ifdef WORDS_BIGENDIAN
--                ptr[x + 1] = r;
--                ptr[x + 2] = g;
--                ptr[x + 3] = b;
-+                ptr[x + 6] = r;
-+                ptr[x + 5] = g;
-+                ptr[x + 4] = b;
- # else
-                 ptr[x + 2] = r;
-                 ptr[x + 1] = g;
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 ptr[x + 0] = r;