[Midnightbsd-cvs] mports: x11-wm/xfce4-desktop: fix desktop menu.

[ctriv at midnightbsd.org]

Log Message:
-----------
fix desktop menu.

Modified Files:
--------------
    mports/x11-wm/xfce4-desktop:
        Makefile (r1.2 -> r1.3)

Added Files:
-----------
    mports/x11-wm/xfce4-desktop/files:
        patch-common__desktop-menu-stub.c (r1.1)
        patch-modules__menu__desktop-menu.c (r1.1)
        patch-panel-plugin__Makefile.in (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/xfce4-desktop/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-wm/xfce4-desktop/Makefile -L x11-wm/xfce4-desktop/Makefile -u -r1.2 -r1.3
--- x11-wm/xfce4-desktop/Makefile
+++ x11-wm/xfce4-desktop/Makefile
@@ -26,7 +26,7 @@
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libgui libutil xfconf panel
+USE_XFCE=	configenv libgui libutil xfconf panel libmenu
 
 OPTIONS=	THUNAR	"Enable thunar support"		on
 
--- /dev/null
+++ x11-wm/xfce4-desktop/files/patch-panel-plugin__Makefile.in
@@ -0,0 +1,10 @@
+--- ./panel-plugin/Makefile.in.orig	Wed Feb 25 17:40:28 2009
++++ ./panel-plugin/Makefile.in	Thu Mar 12 19:03:52 2009
+@@ -341,6 +341,7 @@
+ 	$(LIBX11_LIBS) \
+ 	$(LIBXFCEGUI4_LIBS) \
+ 	$(LIBXFCE4PANEL_LIBS) \
++	$(LIBXFCE4MENU_LIBS) \
+ 	$(THUNAR_VFS_LIBS)
+ 
+ @HAVE_CYGWIN_TRUE at xfce4_menu_plugin_LDFLAGS = \
--- /dev/null
+++ x11-wm/xfce4-desktop/files/patch-modules__menu__desktop-menu.c
@@ -0,0 +1,29 @@
+--- ./modules/menu/desktop-menu.c.orig	Wed Feb 25 17:32:50 2009
++++ ./modules/menu/desktop-menu.c	Thu Mar 12 19:10:22 2009
+@@ -105,6 +105,9 @@
+ G_MODULE_EXPORT void xfce_desktop_menu_destroy_impl(XfceDesktopMenu *desktop_menu);
+ G_MODULE_EXPORT gchar *g_module_check_init(GModule *module);
+ 
++/* init stuff (mbsd added) */
++G_MODULE_EXPORT void xfce_desktop_menu_init(const gchar*);
++G_MODULE_EXPORT void xfce_desktop_menu_shutdown();
+ 
+ static void _xfce_desktop_menu_free_menudata(XfceDesktopMenu *desktop_menu);
+ 
+@@ -117,6 +120,16 @@
+                                    XfceMenu *xfce_menu,
+                                    GtkWidget *menu,
+                                    GList **menu_items_return);
++
++G_MODULE_EXPORT void xfce_desktop_menu_init(const gchar *name) 
++{
++  xfce_menu_init(name);
++}
++
++G_MODULE_EXPORT void xfce_desktop_menu_shutdown()
++{
++  xfce_menu_shutdown();
++}
+ 
+ static void
+ itheme_changed_cb(GtkIconTheme *itheme, gpointer user_data)
--- /dev/null
+++ x11-wm/xfce4-desktop/files/patch-common__desktop-menu-stub.c
@@ -0,0 +1,14 @@
+--- ./common/desktop-menu-stub.c.orig	Mon Jan 12 17:03:12 2009
++++ ./common/desktop-menu-stub.c	Thu Mar 12 19:03:52 2009
+@@ -118,9 +118,9 @@
+     }
+     
+     if(!_setup_functions(module)
+-       || !g_module_symbol(module, "xfce_menu_init",
++       || !g_module_symbol(module, "xfce_desktop_menu_init",
+                            (gpointer)&my_xfce_menu_init)
+-       || !g_module_symbol(module, "xfce_menu_shutdown",
++       || !g_module_symbol(module, "xfce_desktop_menu_shutdown",
+                            (gpointer)&my_xfce_menu_shutdown))
+     {
+         if(err) {