rpms/gnome-desktop/devel add-randr-12.patch, 1.6, 1.7 gnome-desktop.spec, 1.119, 1.120

Soren Sandmann Pedersen (ssp) fedora-extras-commits at redhat.com
Tue Feb 12 16:46:54 UTC 2008


Author: ssp

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

Modified Files:
	add-randr-12.patch gnome-desktop.spec 
Log Message:
Update randrwrap

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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- add-randr-12.patch	4 Feb 2008 13:47:45 -0000	1.6
+++ add-randr-12.patch	12 Feb 2008 16:46:34 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up gnome-desktop-2.21.90/configure.in.add-randr-12 gnome-desktop-2.21.90/configure.in
 --- gnome-desktop-2.21.90/configure.in.add-randr-12	2008-01-27 18:48:13.000000000 -0500
-+++ gnome-desktop-2.21.90/configure.in	2008-01-31 16:44:28.000000000 -0500
++++ gnome-desktop-2.21.90/configure.in	2008-02-04 08:50:16.000000000 -0500
 @@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
  AC_SUBST(GNOME_DISTRIBUTOR)
  AC_SUBST(GNOME_DATE)
@@ -18,17 +18,24 @@
  
 diff -up gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am
 --- gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12	2008-01-27 18:44:20.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am	2008-01-31 16:44:28.000000000 -0500
-@@ -2,4 +2,5 @@ libgnomeui_desktopdir = $(includedir)/gn
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am	2008-02-12 11:34:54.000000000 -0500
+@@ -2,4 +2,7 @@ libgnomeui_desktopdir = $(includedir)/gn
  libgnomeui_desktop_HEADERS = \
  	gnome-ditem-edit.h \
  	gnome-hint.h       \
 -	gnome-bg.h
 +	gnome-bg.h         \
-+	randrwrap.h
++	randrwrap.h	   \
++	monitor-db.h
++
+diff -up gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/monitor-db.h.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/monitor-db.h
+--- gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/monitor-db.h.add-randr-12	2008-02-12 11:36:11.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/monitor-db.h	2008-02-12 11:37:03.000000000 -0500
+@@ -0,0 +1 @@
++ 
 diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h
---- /dev/null	2008-01-30 11:34:25.225700292 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h	2008-02-04 08:33:51.000000000 -0500
+--- /dev/null	2008-02-12 08:56:47.229685651 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h	2008-02-12 09:12:16.000000000 -0500
 @@ -0,0 +1,100 @@
 +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#error This is not yet for general consumption.
@@ -130,9 +137,14 @@
 +					    RWRotation	     rotation);
 +
 +#endif
+diff -up gnome-desktop-2.21.90/libgnome-desktop/monitor-db.c.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/monitor-db.c
+--- gnome-desktop-2.21.90/libgnome-desktop/monitor-db.c.add-randr-12	2008-02-12 11:34:19.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/monitor-db.c	2008-02-12 11:36:53.000000000 -0500
+@@ -0,0 +1 @@
++ 
 diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c
---- /dev/null	2008-01-30 11:34:25.225700292 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c	2008-02-04 08:33:51.000000000 -0500
+--- /dev/null	2008-02-12 08:56:47.229685651 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c	2008-02-12 09:12:16.000000000 -0500
 @@ -0,0 +1,1042 @@
 +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#include "libgnomeui/randrwrap.h"
@@ -150,6 +162,8 @@
 +    Display *		xdisplay;
 +    Screen *		xscreen;
 +    Window		xroot;
++    
++    int			randr_event_base;
 +
 +    int			min_width;
 +    int			max_width;
@@ -164,8 +178,6 @@
 +    RWOutput **		outputs;
 +    RWCrtc **		crtcs;
 +    RWMode **		modes;
-+    
-+    int			randr_event_base;
 +};
 +
 +struct RWOutput
@@ -1178,14 +1190,15 @@
 +#endif
 diff -up gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/Makefile.am
 --- gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12	2008-01-27 18:44:20.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am	2008-01-31 16:44:28.000000000 -0500
-@@ -20,7 +20,8 @@ libgnome_desktop_2_la_SOURCES = \
++++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am	2008-02-12 11:35:10.000000000 -0500
+@@ -20,7 +20,9 @@ libgnome_desktop_2_la_SOURCES = \
  	gnome-desktop-item.c	\
  	gnome-ditem-edit.c	\
  	gnome-hint.c		\
 -	gnome-bg.c
 +	gnome-bg.c		\
-+	randrwrap.c
++	randrwrap.c		\
++	monitor-db.c
  
  libgnome_desktop_2_la_LIBADD =	\
  	$(XLIB_LIBS)		\


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-desktop.spec	12 Feb 2008 06:08:01 -0000	1.119
+++ gnome-desktop.spec	12 Feb 2008 16:46:34 -0000	1.120
@@ -122,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Feb 12 2008 Soren Sandmann <sandmann at redhat.com> 
+- Update randrwrap
+
 * Tue Feb 12 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-1
 - Update to 2.21.91
 




More information about the fedora-extras-commits mailing list