[pkgsrc/trunk]: pkgsrc/x11/gnome-panel Avoid:

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/007de415f946
branches:  trunk
changeset: 643407:007de415f946
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Tue Dec 16 10:46:32 2014 +0000

description:
Avoid:

  The Panel encountered a problem while loading
  "ClockAppletFactory::ClockApplet" Do you want to delete the applet
  from your configuration?

Solution:

  https://mail.gnome.org/archives/commits-list/2012-May/msg05607.html

While here, depend on sysutils/desktop-file-utils/desktopdb.mk

diffstat:

 x11/gnome-panel/Makefile                                             |   5 +-
 x11/gnome-panel/distinfo                                             |   3 +-
 x11/gnome-panel/patches/patch-libpanel-applet_panel-applet-factory.c |  26 ++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 77ca3490388d -r 007de415f946 x11/gnome-panel/Makefile
--- a/x11/gnome-panel/Makefile  Tue Dec 16 08:45:37 2014 +0000
+++ b/x11/gnome-panel/Makefile  Tue Dec 16 10:46:32 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2014/10/07 16:47:15 adam Exp $
+# $NetBSD: Makefile,v 1.174 2014/12/16 10:46:32 prlw1 Exp $
 
 DISTNAME=              gnome-panel-2.32.1
-PKGREVISION=           40
+PKGREVISION=           41
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-panel/2.32/}
 EXTRACT_SUFX=          .tar.bz2
@@ -76,6 +76,7 @@
 #.include "../../security/policykit/buildlink3.mk"
 #.include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff -r 77ca3490388d -r 007de415f946 x11/gnome-panel/distinfo
--- a/x11/gnome-panel/distinfo  Tue Dec 16 08:45:37 2014 +0000
+++ b/x11/gnome-panel/distinfo  Tue Dec 16 10:46:32 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2010/11/24 20:26:20 drochner Exp $
+$NetBSD: distinfo,v 1.62 2014/12/16 10:46:32 prlw1 Exp $
 
 SHA1 (gnome-panel-2.32.1.tar.bz2) = 561ec56307854b5cbd6b0d0a0b7f9e0e6c2a0127
 RMD160 (gnome-panel-2.32.1.tar.bz2) = 03a440cee7e219b42a0375ae2d2d53fbd17b604b
@@ -7,3 +7,4 @@
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
 SHA1 (patch-af) = ca6947149c9cb2557814da51122fe5ce202469b1
+SHA1 (patch-libpanel-applet_panel-applet-factory.c) = 6425f0ceeec62c377bbb8fddd4e189846da0c64e
diff -r 77ca3490388d -r 007de415f946 x11/gnome-panel/patches/patch-libpanel-applet_panel-applet-factory.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-panel/patches/patch-libpanel-applet_panel-applet-factory.c      Tue Dec 16 10:46:32 2014 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-libpanel-applet_panel-applet-factory.c,v 1.1 2014/12/16 10:46:32 prlw1 Exp $
+
+Help prevent race condition at session start.
+https://mail.gnome.org/archives/commits-list/2012-May/msg05607.html
+
+--- libpanel-applet/panel-applet-factory.c.orig        2010-06-22 23:00:28.000000000 +0000
++++ libpanel-applet/panel-applet-factory.c
+@@ -210,7 +210,7 @@ static const GDBusInterfaceVTable interf
+ static GDBusNodeInfo *introspection_data = NULL;
+ 
+ static void
+-on_name_acquired (GDBusConnection    *connection,
++on_bus_acquired (GDBusConnection    *connection,
+                 const gchar        *name,
+                 PanelAppletFactory *factory)
+ {
+@@ -251,8 +251,8 @@ panel_applet_factory_register_service (P
+       g_bus_own_name (G_BUS_TYPE_SESSION,
+                       service_name,
+                       G_BUS_NAME_OWNER_FLAGS_NONE,
++                      (GBusNameAcquiredCallback) on_bus_acquired,
+                       NULL,
+-                      (GBusNameAcquiredCallback) on_name_acquired,
+                       (GBusNameLostCallback) on_name_lost,
+                       factory, NULL);
+       g_free (service_name);