rpms/metacity/F-12 metacity-2.28-xlib.patch, NONE, 1.1 metacity.spec, 1.217, 1.218

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9003

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.28-xlib.patch 
Log Message:
add patch from colin walters to fix builing on sparc


metacity-2.28-xlib.patch:
 async-getprop.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE metacity-2.28-xlib.patch ---
>From 6e2863b51b1404e9c1525243c9789d0643136456 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Tue, 2 Mar 2010 17:16:07 -0500
Subject: [PATCH] Work around usage of XPointer

XLib has historically used "char*" for "generic pointer" but
compliers rightly complain when casting this to a structure.

Work around this by casting to void * and letting the implicit
conversion to a structure type take effect.

https://bugzilla.gnome.org/show_bug.cgi?id=611644
---
 src/core/async-getprop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/core/async-getprop.c b/src/core/async-getprop.c
index 31b0edc..6485544 100644
--- a/src/core/async-getprop.c
+++ b/src/core/async-getprop.c
@@ -215,7 +215,7 @@ async_get_property_handler (Display *dpy,
   AgPerDisplayData *dd;
   int bytes_read;
 
-  dd = (AgPerDisplayData*) data;
+  dd = (void*) data;
   
 #if 0
   printf ("%s: seeing request seq %ld buflen %d\n", __FUNCTION__,
-- 
1.6.6.1


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- metacity.spec	3 Jan 2010 16:20:06 -0000	1.217
+++ metacity.spec	2 Mar 2010 23:01:26 -0000	1.218
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -55,6 +55,8 @@ Patch25: metacity-2.28-xioerror-unknown-
 # https://bugzilla.gnome.org/show_bug.cgi?id=604867
 Patch26: metacity-2.28-IceCloseConnection.patch
 
+Patch27: metacity-2.28-xlib.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,10 +139,17 @@ API. This package exists purely for tech
 %patch24 -p1 -b .empty-keybindings
 %patch25 -p1 -b .xioerror-unknown-display
 %patch26 -p1 -b .IceCloseConnection
+%patch27 -p1 -b .XLibCast
 
 # force regeneration
 rm src/metacity.schemas
 
+# on sparc we egt a bunch of 
+# error: cast increases required alignment of target type
+%ifarch %{sparc}
+sed -i -e 's|-Werror||g' configure*
+%endif
+
 autoreconf -i -f
 
 %build
@@ -244,6 +253,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Mar 03 2010 Dennis Gilmore <dennis at ausil.us> - 2.28.0-15
+- apply patch from Colin Walters for casting 
+
 * Sun Jan  3 2010 Owen Taylor <otaylor at redhat.com> - 2.28.0-14
 - Fix crash in _IceTransClose (rhbz 551994)
   The previous patch for rhbz 539905 didn't actually fix the