r1053 - in /unstable/evolution-data-server/debian: changelog patches/65_evolution-color.patch

[heikkih-guest at users.alioth.debian.org]

Author: heikkih-guest
Date: Mon May 19 19:15:41 2008
New Revision: 1053

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1053
Log:
Add patch to fix 16bits color function.

Added:
    unstable/evolution-data-server/debian/patches/65_evolution-color.patch
Modified:
    unstable/evolution-data-server/debian/changelog

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1053&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Mon May 19 19:15:41 2008
@@ -7,8 +7,11 @@
   * debian/patches/55_fix_gpg_breaks_keyring.patch:
     - Add patch from upstream to stop gpg breaking the keyring
       (closes: #481940)
-
- -- Heikki Henriksen <heikkih at gmail.com>  Mon, 19 May 2008 21:01:46 +0200
+  * debian/patches/65_evolution-color.patch
+    - Add patch to fix 16bits color function. Thanks to Sjoerd Simmons.
+      (closes: #477807)
+
+ -- Heikki Henriksen <heikkih at gmail.com>  Mon, 19 May 2008 21:14:30 +0200
 
 evolution-data-server (2.22.1.1-1) unstable; urgency=low
 

Added: unstable/evolution-data-server/debian/patches/65_evolution-color.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/65_evolution-color.patch?rev=1053&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/65_evolution-color.patch (added)
+++ unstable/evolution-data-server/debian/patches/65_evolution-color.patch Mon May 19 19:15:41 2008
@@ -1,0 +1,35 @@
+--- evolution-data-server-2.22.1.orig/libedataserver/e-source.c
++++ evolution-data-server-2.22.1/libedataserver/e-source.c
+@@ -689,7 +689,7 @@
+ 		    guint32 *color_return)
+ {
+ 	const gchar *color_spec;
+-	guint32 color;
++	guint32 color, color0, color1;
+ 
+ 	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
+ 
+@@ -698,9 +698,23 @@
+ 	if (color_spec == NULL)
+ 		return FALSE;
+ 
++	/* check for 2 bytes per color */
++	if (strlen(color_spec) == 13 &&
++		sscanf (color_spec, "#%04x%08x", &color0, &color1) != 1) {
++		/* Just toss out the least significant parts,
++		 * should be close enough */
++		color = (color0 >> 8 & 0xff);
++		color <<= 8;
++		color |= (color1 >> 24 & 0xff);
++		color <<= 8;
++		color |= (color1 >> 8 & 0xff);
++		goto done;
++	}
++
+ 	if (sscanf (color_spec, "#%06x", &color) != 1)
+ 		return FALSE;
+ 
++done:
+ 	if (color_return != NULL)
+ 		*color_return = color;
+