rpms/gnome-desktop/devel add-randr-12.patch,1.12,1.13

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10817

Modified Files:
	add-randr-12.patch 
Log Message:
Fix build problem

add-randr-12.patch:

Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/add-randr-12.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- add-randr-12.patch	20 Feb 2008 18:26:49 -0000	1.12
+++ add-randr-12.patch	20 Feb 2008 18:33:19 -0000	1.13
@@ -1,6 +1,6 @@
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,1198 @@
 +#include <stdlib.h>
 +#include <string.h>
@@ -1046,13 +1046,13 @@
 +
 +	if (mode)
 +	{
-+	    int w, h, tmp;
++	    int w, h;
 +	    rw_crtc_get_position (crtc, &x, &y);
 +
 +	    w = rw_mode_get_width (mode);
 +	    h = rw_mode_get_height (mode);
 +	    
-+	    if (crtc_is_rotated (info))
++	    if (crtc_is_rotated (crtc))
 +	    {
 +		int tmp = h;
 +		h = w;
@@ -1202,7 +1202,7 @@
 +}
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,551 @@
 +/*
 + * Copyright 2007 Red Hat, Inc.
@@ -1757,7 +1757,7 @@
 +}
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,100 @@
 +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#error This is not yet for general consumption.
@@ -1861,7 +1861,7 @@
 +#endif
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,51 @@
 +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#error This is not for general consumption yet.
@@ -1928,7 +1928,7 @@
 +
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,1122 @@
 +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#include "libgnomeui/randrwrap.h"
@@ -3054,7 +3054,7 @@
 +#endif
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/display-name.c
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/display-name.c	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/display-name.c	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,193 @@
 +/*
 + * Copyright 2007 Red Hat, Inc.
@@ -3251,7 +3251,7 @@
 +}
 diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/edid.h
 --- /dev/null	2008-02-19 17:35:05.543056439 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/edid.h	2008-02-20 13:34:08.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/edid.h	2008-02-20 13:41:10.000000000 -0500
 @@ -0,0 +1,170 @@
 +typedef unsigned char uchar;
 +typedef struct MonitorInfo MonitorInfo;