[tvtime] fix #829901: errors in setting of the _NET_WM_ICON property

[Tomas Smetana]

commit 10103d877418fcbb3bd6a41d1a86733bcd3e4c7a
Author: Tomas Smetana <tsmetana at fedoraproject.org>
Date:   Mon Aug 6 12:36:58 2012 +0200

    fix #829901: errors in setting of the _NET_WM_ICON property

 tvtime-1.0.2-wmicon.patch |   35 +++++++++++++++++++++++++++++++++++
 tvtime.spec               |    7 ++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/tvtime-1.0.2-wmicon.patch b/tvtime-1.0.2-wmicon.patch
new file mode 100644
index 0000000..85e2457
--- /dev/null
+++ b/tvtime-1.0.2-wmicon.patch
@@ -0,0 +1,35 @@
+diff -up tvtime-1.0.2/src/xcommon.c.icon tvtime-1.0.2/src/xcommon.c
+--- tvtime-1.0.2/src/xcommon.c.icon	2012-08-06 12:24:23.872622342 +0200
++++ tvtime-1.0.2/src/xcommon.c	2012-08-06 12:25:16.693807486 +0200
+@@ -207,7 +207,7 @@ static const char *tvtime_icon =
+ "                                "
+ "                                " ;
+ 
+-static void load_icon( uint32_t *data )
++static void load_icon( long *data )
+ {
+     int i;
+ 
+@@ -226,10 +226,10 @@ static void load_icon( uint32_t *data )
+         icon_colours[ '-' ] = 0xff007f7f;
+     }
+ 
+-    *data++ = 32;
+-    *data++ = 32;
++    *data++ = 32L;
++    *data++ = 32L;
+     for( i = 0; i < 32 * 32; i++ ) {
+-        *data++ = icon_colours[ (int) tvtime_icon[ i ] ];
++        *data++ = (long) icon_colours[ (int) tvtime_icon[ i ] ];
+     }
+ }
+ 
+@@ -1004,7 +1004,7 @@ int xcommon_open_display( const char *us
+ 
+     /* Set the icon on the window. */
+     {
+-        uint32_t *data = malloc( 1026 * 4 );
++        long *data = malloc( 1026 * sizeof(long) );
+         if( data ) {
+             load_icon( data );
+             XChangeProperty( display, wm_window, net_wm_icon, cardinal, 32,
diff --git a/tvtime.spec b/tvtime.spec
index bf504e4..75dc831 100644
--- a/tvtime.spec
+++ b/tvtime.spec
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -16,6 +16,7 @@ Patch5: tvtime-1.0.2-alsamixer2.patch
 Patch6: tvtime-1.0.2-xss.patch
 Patch7: tvtime-1.0.2-videoinput.patch
 Patch8: tvtime-1.0.2-png15.patch
+Patch9: tvtime-1.0.2-wmicon.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +63,7 @@ videophiles.
 %patch6 -p1 -b .xss
 %patch7 -p1 -b .vidioc
 %patch8 -p1 -b .png15
+%patch9 -p1 -b .wmicon
 
 for i in AUTHORS docs/man/{de,es}/*.?; do
 	iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -127,6 +129,9 @@ rm -rf %{buildroot}
 %{_bindir}/tvtime
 
 %changelog
+* Mon Aug 06 2012 Tomas Smetana <tsmetana at redhat.com> - 1.0.2-22
+- fix #829901: errors in setting of the _NET_WM_ICON property
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild