rpms/gnome-desktop/devel clone-modes.patch, 1.2, 1.3 gnome-desktop.spec, 1.170, 1.171

Soren Sandmann Pedersen ssp at fedoraproject.org
Wed Sep 24 18:16:02 UTC 2008 

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28456

Modified Files:
	clone-modes.patch gnome-desktop.spec 
Log Message:
MAke clone modes work again

clone-modes.patch:

Index: clone-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/clone-modes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clone-modes.patch	4 Sep 2008 17:11:02 -0000	1.2
+++ clone-modes.patch	24 Sep 2008 18:15:32 -0000	1.3
@@ -1,63 +1,7 @@
-Index: libgnome-desktop/libgnomeui/gnome-rr-config.h
-===================================================================
---- libgnome-desktop/libgnomeui/gnome-rr-config.h	(revision 5210)
-+++ libgnome-desktop/libgnomeui/gnome-rr-config.h	(working copy)
-@@ -34,6 +34,13 @@
- typedef struct GnomeOutputInfo GnomeOutputInfo;
- typedef struct GnomeRRConfig GnomeRRConfig;
- 
-+/* FIXME:
-+ *
-+ * This structure is a Frankenstein monster where all of the fields
-+ * are generated by the system, but some of them can be changed by
-+ * the client.
-+ */
-+
- struct GnomeOutputInfo
- {
-     char *		name;
-@@ -66,14 +73,24 @@
- };
- 
- GnomeRRConfig  *gnome_rr_config_new_current  (GnomeRRScreen  *screen);
-+GnomeRRConfig  *gnome_rr_config_new_stored   (GnomeRRScreen  *screen);
- void            gnome_rr_config_free         (GnomeRRConfig  *configuration);
- gboolean        gnome_rr_config_match        (GnomeRRConfig  *config1,
- 					      GnomeRRConfig  *config2);
-+gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
-+					      GnomeRRConfig  *config2);
- gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
- 					      GError        **err);
- void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
-+gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
-+					      GnomeRRScreen  *screen);
- gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen);
- gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
- 					      GnomeRRScreen  *screen);
- 
-+/* A utility function that isn't really in the spirit of this file, but I don't
-+ * don't know a better place for it.
-+ */
-+GnomeRRMode **gnome_rr_create_clone_modes (GnomeRRScreen *screen);
-+
- #endif
-Index: libgnome-desktop/libgnomeui/gnome-rr.h
-===================================================================
---- libgnome-desktop/libgnomeui/gnome-rr.h	(revision 5210)
-+++ libgnome-desktop/libgnomeui/gnome-rr.h	(working copy)
-@@ -56,6 +56,7 @@
- GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
- GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
- GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
-+GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
- void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
- 						    int                    width,
- 						    int                    height,
-Index: libgnome-desktop/gnome-rr.c
-===================================================================
---- libgnome-desktop/gnome-rr.c	(revision 5210)
-+++ libgnome-desktop/gnome-rr.c	(working copy)
-@@ -50,6 +50,8 @@
+diff -up gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c.clone-modes gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c
+--- gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c.clone-modes	2008-09-24 14:09:09.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c	2008-09-24 14:09:09.000000000 -0400
+@@ -50,6 +50,8 @@ struct ScreenInfo
      GnomeRRMode **	modes;
      
      GnomeRRScreen *	screen;
@@ -66,7 +10,7 @@
  };
  
  struct GnomeRRScreen
-@@ -222,11 +224,86 @@
+@@ -222,11 +224,86 @@ screen_info_free (ScreenInfo *info)
  	    mode_free (*mode);
  	g_free (info->modes);
      }
@@ -153,7 +97,7 @@
  fill_out_screen_info (Display *xdisplay,
  		      Window xroot,
  		      ScreenInfo *info)
-@@ -322,6 +399,8 @@
+@@ -322,6 +399,8 @@ fill_out_screen_info (Display *xdisplay,
  	    
  	    mode_initialize (mode, &(resources->modes[i]));
  	}
@@ -162,7 +106,7 @@
  	
  	return TRUE;
      }
-@@ -526,6 +605,15 @@
+@@ -526,6 +605,15 @@ gnome_rr_screen_list_modes (GnomeRRScree
      return screen->info->modes;
  }
  
@@ -178,11 +122,10 @@
  GnomeRRCrtc **
  gnome_rr_screen_list_crtcs (GnomeRRScreen *screen)
  {
-Index: libgnome-desktop/gnome-rr-config.c
-===================================================================
---- libgnome-desktop/gnome-rr-config.c	(revision 5210)
-+++ libgnome-desktop/gnome-rr-config.c	(working copy)
-@@ -745,6 +745,42 @@
+diff -up gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c.clone-modes gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c
+--- gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c.clone-modes	2008-09-24 14:09:09.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c	2008-09-24 14:11:34.000000000 -0400
+@@ -748,6 +748,42 @@ output_match (GnomeOutputInfo *output1, 
      return TRUE;
  }
  
@@ -225,7 +168,7 @@
  static GnomeOutputInfo *
  find_output (GnomeRRConfig *config, const char *name)
  {
-@@ -761,6 +797,9 @@
+@@ -764,6 +800,9 @@ find_output (GnomeRRConfig *config, cons
      return NULL;
  }
  
@@ -235,7 +178,7 @@
  gboolean
  gnome_rr_config_match (GnomeRRConfig *c1, GnomeRRConfig *c2)
  {
-@@ -779,6 +818,28 @@
+@@ -782,6 +821,28 @@ gnome_rr_config_match (GnomeRRConfig *c1
      return TRUE;
  }
  
@@ -264,7 +207,7 @@
  static GnomeOutputInfo **
  make_outputs (GnomeRRConfig *config)
  {
-@@ -840,21 +901,6 @@
+@@ -843,21 +904,6 @@ gnome_rr_config_applicable (GnomeRRConfi
      return result;
  }
  
@@ -286,7 +229,7 @@
  /* Database management */
  
  static gchar *
-@@ -1036,13 +1082,68 @@
+@@ -1039,14 +1085,69 @@ gnome_rr_config_save (GnomeRRConfig *con
      return result;
  }
  
@@ -294,7 +237,7 @@
 -apply_configuration (GnomeRRConfig *conf, GnomeRRScreen *screen)
 +static GnomeRRConfig *
 +gnome_rr_config_copy (GnomeRRConfig *config)
- {
++{
 +    GnomeRRConfig *copy = g_new0 (GnomeRRConfig, 1);
 +    int i;
 +    GPtrArray *array = g_ptr_array_new ();
@@ -349,16 +292,17 @@
 +gboolean
 +gnome_rr_config_apply (GnomeRRConfig *config,
 +		       GnomeRRScreen *screen)
-+{
+ {
      CrtcAssignment *assignment;
      GnomeOutputInfo **outputs;
+     gboolean result = FALSE;
  
 -    outputs = make_outputs (conf);
 +    outputs = make_outputs (config);
  
      assignment = crtc_assignment_new (screen, outputs);
  
-@@ -1065,42 +1166,51 @@
+@@ -1068,42 +1169,51 @@ apply_configuration (GnomeRRConfig *conf
  gboolean
  gnome_rr_config_apply_stored (GnomeRRScreen *screen)
  {
@@ -432,3 +376,56 @@
  /*
   * CRTC assignment
   */
+diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h.clone-modes gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h
+--- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h.clone-modes	2008-09-22 17:01:45.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h	2008-09-24 14:09:09.000000000 -0400
+@@ -34,6 +34,13 @@
+ typedef struct GnomeOutputInfo GnomeOutputInfo;
+ typedef struct GnomeRRConfig GnomeRRConfig;
+ 
++/* FIXME:
++ *
++ * This structure is a Frankenstein monster where all of the fields
++ * are generated by the system, but some of them can be changed by
++ * the client.
++ */
++
+ struct GnomeOutputInfo
+ {
+     char *		name;
+@@ -66,14 +73,24 @@ struct GnomeRRConfig
+ };
+ 
+ GnomeRRConfig  *gnome_rr_config_new_current  (GnomeRRScreen  *screen);
++GnomeRRConfig  *gnome_rr_config_new_stored   (GnomeRRScreen  *screen);
+ void            gnome_rr_config_free         (GnomeRRConfig  *configuration);
+ gboolean        gnome_rr_config_match        (GnomeRRConfig  *config1,
+ 					      GnomeRRConfig  *config2);
++gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
++					      GnomeRRConfig  *config2);
+ gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
+ 					      GError        **err);
+ void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
++gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
++					      GnomeRRScreen  *screen);
+ gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen);
+ gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
+ 					      GnomeRRScreen  *screen);
+ 
++/* A utility function that isn't really in the spirit of this file, but I don't
++ * don't know a better place for it.
++ */
++GnomeRRMode **gnome_rr_create_clone_modes (GnomeRRScreen *screen);
++
+ #endif
+diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h.clone-modes gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h
+--- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h.clone-modes	2008-09-22 17:01:45.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h	2008-09-24 14:09:09.000000000 -0400
+@@ -56,6 +56,7 @@ void            gnome_rr_screen_destroy 
+ GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
+ GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
+ GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
++GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
+ void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
+ 						    int                    width,
+ 						    int                    height,


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gnome-desktop.spec	22 Sep 2008 22:10:18 -0000	1.170
+++ gnome-desktop.spec	24 Sep 2008 18:15:32 -0000	1.171
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -78,7 +78,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .rr-leaks
-%patch3 -p0 -b .clone-modes
+%patch3 -p1 -b .clone-modes
 %patch4 -p1 -b .fade
 
 %build
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep 24 2008 Soren Sandmann <sandmann at redhat.com> - 2.24.0-2
+- Make clone-modes.patch work again
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0

More information about the fedora-extras-commits mailing list