r38353 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/19_dconf_api_changes.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Jun 4 04:52:17 UTC 2013 

Author: biebl
Date: Tue Jun  4 04:52:03 2013
New Revision: 38353

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38353
Log:
debian/patches/19_dconf_api_changes.patch: Adjust to DConf API changes.
Requires libdconf-dev (>= 0.13.4).

Added:
    desktop/unstable/gnome-panel/debian/patches/19_dconf_api_changes.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=38353&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Tue Jun  4 04:52:03 2013
@@ -1,3 +1,10 @@
+gnome-panel (3.4.2.1-5) UNRELEASED; urgency=low
+
+  * debian/patches/19_dconf_api_changes.patch: Adjust to DConf API changes.
+    Requires libdconf-dev (>= 0.13.4).
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 04 Jun 2013 06:49:20 +0200
+
 gnome-panel (3.4.2.1-4) unstable; urgency=low
 
   * Team upload.

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=38353&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Tue Jun  4 04:52:03 2013
@@ -26,7 +26,7 @@
                libwnck-3-dev (>= 2.91.0),
                libgconf2-dev (>= 2.6.1),
                libgnome-menu-3-dev (>= 3.1.4),
-               libdconf-dev (>= 0.7),
+               libdconf-dev (>= 0.13.4),
                libecal1.2-dev (>= 2.91.2),
                libedataserver1.2-dev (>= 2.91.2),
                libedataserverui-3.0-dev (>= 2.91.2),

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=38353&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Tue Jun  4 04:52:03 2013
@@ -21,7 +21,7 @@
                libwnck-3-dev (>= 2.91.0),
                libgconf2-dev (>= 2.6.1),
                libgnome-menu-3-dev (>= 3.1.4),
-               libdconf-dev (>= 0.7),
+               libdconf-dev (>= 0.13.4),
                libecal1.2-dev (>= 2.91.2),
                libedataserver1.2-dev (>= 2.91.2),
                libedataserverui-3.0-dev (>= 2.91.2),

Added: desktop/unstable/gnome-panel/debian/patches/19_dconf_api_changes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/19_dconf_api_changes.patch?rev=38353&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/19_dconf_api_changes.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/19_dconf_api_changes.patch [utf-8] Tue Jun  4 04:52:03 2013
@@ -1,0 +1,72 @@
+commit 815246a3e297ba60694b20070af1324942f5f08b
+Author: Ryan Lortie <desrt at desrt.ca>
+Date:   Sun Jul 15 14:52:07 2012 -0400
+
+    libpanel-util: adjust to DConf API changes
+    
+    The libdconf API is unstable and just underwent some changes.  Adjust to
+    those.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=679971
+
+Index: gnome-panel-3.4.2.1/configure.ac
+===================================================================
+--- gnome-panel-3.4.2.1.orig/configure.ac	2013-06-04 06:15:27.628359692 +0200
++++ gnome-panel-3.4.2.1/configure.ac	2013-06-04 06:16:09.044680329 +0200
+@@ -78,12 +78,13 @@
+ CAIRO_REQUIRED=1.0.0
+ GWEATHER_REQUIRED=2.91.0
+ DBUS_GLIB_REQUIRED=0.80
++DCONF_REQUIRED=0.13.4
+ 
+ dnl pkg-config dependency checks
+ 
+ PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
+ 
+-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
++PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf >= $DCONF_REQUIRED)
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+ 
+Index: gnome-panel-3.4.2.1/gnome-panel/libpanel-util/panel-dconf.c
+===================================================================
+--- gnome-panel-3.4.2.1.orig/gnome-panel/libpanel-util/panel-dconf.c	2013-06-04 06:15:27.628359692 +0200
++++ gnome-panel-3.4.2.1/gnome-panel/libpanel-util/panel-dconf.c	2013-06-04 06:15:27.624359660 +0200
+@@ -24,15 +24,14 @@
+ 
+ #include <string.h>
+ 
+-#include <dconf-client.h>
+-#include <dconf-paths.h>
++#include <dconf.h>
+ 
+ #include "panel-dconf.h"
+ 
+ static DConfClient *
+ panel_dconf_client_get (void)
+ {
+-        return dconf_client_new (NULL, NULL, NULL, NULL);
++        return dconf_client_new ();
+ }
+ 
+ gboolean
+@@ -43,8 +42,7 @@
+         gboolean     ret;
+         DConfClient *client = panel_dconf_client_get ();
+ 
+-        ret = dconf_client_write (client, key, value,
+-                                  NULL, NULL, error);
++        ret = dconf_client_write_sync (client, key, value, NULL, NULL, error);
+ 
+         g_object_unref (client);
+ 
+@@ -58,8 +56,7 @@
+         gboolean     ret;
+         DConfClient *client = panel_dconf_client_get ();
+ 
+-        ret = dconf_client_write (client, dir, NULL,
+-                                  NULL, NULL, error);
++        ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error);
+ 
+         g_object_unref (client);
+ 

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=38353&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Tue Jun  4 04:52:03 2013
@@ -7,3 +7,4 @@
 16_remove_online_accounts_from_user_menu.patch
 17_avoid_double_forking.patch
 18_fix_force_quit_applet.patch
+19_dconf_api_changes.patch

More information about the pkg-gnome-commits mailing list