r19600 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in patches/03_gnomedesktop_api.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Apr 16 08:16:03 UTC 2009


Author: joss
Date: Thu Apr 16 08:16:03 2009
New Revision: 19600

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19600
Log:
* 03_gnomedesktop_api.patch: patch to cope with the API changes in 
  GnomeRR 2.26. Closes: #524253.
* Bump build-dependency on gnome-desktop to 2.26.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/03_gnomedesktop_api.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/control
    desktop/unstable/gnome-settings-daemon/debian/control.in
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=19600&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Thu Apr 16 08:16:03 2009
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.24.1-3) unstable; urgency=low
+
+  * 03_gnomedesktop_api.patch: patch to cope with the API changes in 
+    GnomeRR 2.26. Closes: #524253.
+  * Bump build-dependency on gnome-desktop to 2.26.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 16 Apr 2009 10:15:45 +0200
+
 gnome-settings-daemon (2.24.1-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=19600&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control Thu Apr 16 08:16:03 2009
@@ -15,7 +15,7 @@
                libgconf2-dev (>= 2.6.1),
                libgnome2-dev,
                libgnomeui-dev,
-               libgnome-desktop-dev (>= 2.23.90),
+               libgnome-desktop-dev (>= 2.26),
                libnotify-dev (>= 0.4.3),
                libglade2-dev,
                libxt-dev,

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=19600&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in Thu Apr 16 08:16:03 2009
@@ -15,7 +15,7 @@
                libgconf2-dev (>= 2.6.1),
                libgnome2-dev,
                libgnomeui-dev,
-               libgnome-desktop-dev (>= 2.23.90),
+               libgnome-desktop-dev (>= 2.26),
                libnotify-dev (>= 0.4.3),
                libglade2-dev,
                libxt-dev,

Added: desktop/unstable/gnome-settings-daemon/debian/patches/03_gnomedesktop_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/03_gnomedesktop_api.patch?rev=19600&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/03_gnomedesktop_api.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/03_gnomedesktop_api.patch Thu Apr 16 08:16:03 2009
@@ -1,0 +1,58 @@
+Index: gnome-settings-daemon-2.24.1/plugins/xrandr/gsd-xrandr-manager.c
+===================================================================
+--- gnome-settings-daemon-2.24.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:08:15.904851080 +0200
++++ gnome-settings-daemon-2.24.1/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:14:24.334003102 +0200
+@@ -118,7 +118,7 @@ on_client_message (GdkXEvent  *xevent,
+             ev->type == ClientMessage &&
+             ev->xclient.message_type == gnome_randr_xatom ()) {
+ 
+-                gnome_rr_config_apply_stored (screen);
++                gnome_rr_config_apply_stored (screen, NULL);
+ 
+                 return GDK_FILTER_REMOVE;
+         }
+@@ -146,7 +146,7 @@ event_filter (GdkXEvent           *xeven
+                 /* FIXME: here we should cycle between valid
+                  * configurations, and save them
+                  */
+-                gnome_rr_config_apply_stored (manager->priv->rw_screen);
++                gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
+ 
+                 return GDK_FILTER_CONTINUE;
+         }
+@@ -391,7 +391,7 @@ get_allowed_rotations_for_output (GsdXra
+ 
+                 output->rotation = rotation_to_test;
+ 
+-                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen)) {
++                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) {
+                         (*out_num_rotations)++;
+                         (*out_rotations) |= rotation_to_test;
+                 }
+@@ -456,7 +456,7 @@ output_rotation_item_activate_cb (GtkChe
+ 
+         error = NULL;
+         if (gnome_rr_config_save (priv->configuration, &error)) {
+-                if (!gnome_rr_config_apply_stored (priv->rw_screen)) {
++                if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) {
+                         error_dialog (_("The selected rotation could not be applied"),
+                                       _("An error occurred while configuring the screen"));
+                         /* FIXME: that message is really useless.  Make
+@@ -694,7 +694,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
+         g_debug ("Starting xrandr manager");
+ 
+         manager->priv->rw_screen = gnome_rr_screen_new (
+-                gdk_screen_get_default (), on_randr_event, manager);
++                gdk_screen_get_default (), on_randr_event, manager, NULL);
+ 
+         if (manager->priv->rw_screen == NULL) {
+                 g_set_error (error, 0, 0, "Failed to initialize XRandR extension");
+@@ -728,7 +728,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
+                 gdk_error_trap_pop ();
+         }
+ 
+-        gnome_rr_config_apply_stored (manager->priv->rw_screen);
++        gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
+ 
+         gdk_window_add_filter (gdk_get_default_root_window(),
+                                (GdkFilterFunc)event_filter,

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=19600&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series Thu Apr 16 08:16:03 2009
@@ -1,5 +1,6 @@
 01_xrdb.patch
 02_missing_libs.patch
+03_gnomedesktop_api.patch
 11_sleepkey.patch
 30_pkgconfig-path.patch
 70_relibtoolize.patch




More information about the pkg-gnome-commits mailing list