From 29bc074c65b0a0bdec40a9eeb65f93df6e642bc0 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 28 Dec 2011 08:56:57 +0000 Subject: [PATCH] Our gnome-session already exports XDG_MENU_PREFIX in the environment, so no need to play with get/setenv. gnome-panel is not supposed to be started by anything than gnome-session anyway and it will ease future updates. --- x11/gnome/panel/Makefile | 4 +-- .../panel/patches/patch-gnome-panel_menu_c | 29 ---------------- .../patch-gnome-panel_panel-menu-bar_c | 33 ------------------- .../patch-gnome-panel_panel-menu-button_c | 12 ------- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 x11/gnome/panel/patches/patch-gnome-panel_menu_c delete mode 100644 x11/gnome/panel/patches/patch-gnome-panel_panel-menu-bar_c delete mode 100644 x11/gnome/panel/patches/patch-gnome-panel_panel-menu-button_c diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile index 71f4cf4b964..3fe8a68c259 100644 --- a/x11/gnome/panel/Makefile +++ b/x11/gnome/panel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.108 2011/12/03 22:17:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.109 2011/12/28 08:56:57 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= GNOME panel GNOME_PROJECT= gnome-panel GNOME_VERSION= 3.2.1 -REVISION= 3 +REVISION= 4 SHARED_LIBS= panel-applet-4 1.0 # 0.0 diff --git a/x11/gnome/panel/patches/patch-gnome-panel_menu_c b/x11/gnome/panel/patches/patch-gnome-panel_menu_c deleted file mode 100644 index 3ac9375a307..00000000000 --- a/x11/gnome/panel/patches/patch-gnome-panel_menu_c +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-gnome-panel_menu_c,v 1.7 2011/09/26 11:14:36 jasper Exp $ ---- gnome-panel/menu.c.orig Mon Aug 1 19:39:56 2011 -+++ gnome-panel/menu.c Mon Sep 26 12:53:17 2011 -@@ -25,6 +25,7 @@ - #include "menu.h" - - #include -+#include - - #include - #include -@@ -1400,8 +1401,16 @@ GtkWidget * - create_main_menu (PanelWidget *panel) - { - GtkWidget *main_menu; -+ gchar *xdgMenuPrefix, *applicationsMenu; - -- main_menu = create_applications_menu ("applications.menu", NULL, TRUE); -+ /* Respect XDG_MENU_PREFIX */ -+ setenv ("XDG_MENU_PREFIX", "gnome-", 0); -+ -+ xdgMenuPrefix = getenv ("XDG_MENU_PREFIX"); -+ applicationsMenu = g_strconcat (xdgMenuPrefix, "applications.menu", NULL); -+ -+ main_menu = create_applications_menu (applicationsMenu, NULL, TRUE); -+ g_free (applicationsMenu); - - g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel); - /* FIXME need to update the panel on parent_set */ diff --git a/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-bar_c b/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-bar_c deleted file mode 100644 index dc058a5a9b1..00000000000 --- a/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-bar_c +++ /dev/null @@ -1,33 +0,0 @@ -$OpenBSD: patch-gnome-panel_panel-menu-bar_c,v 1.2 2011/09/12 07:28:54 jasper Exp $ ---- gnome-panel/panel-menu-bar.c.orig Wed May 18 11:12:53 2011 -+++ gnome-panel/panel-menu-bar.c Wed May 18 11:14:30 2011 -@@ -29,6 +29,7 @@ - #include "panel-menu-bar.h" - - #include -+#include - #include - - #include -@@ -125,11 +126,20 @@ panel_menu_bar_setup_tooltip (PanelMenuBar *menubar) - static void - panel_menu_bar_init (PanelMenuBar *menubar) - { -+ gchar *xdgMenuPrefix, *applicationsMenu; -+ - menubar->priv = PANEL_MENU_BAR_GET_PRIVATE (menubar); - - menubar->priv->info = NULL; - -- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE); -+ /* Respect XDG_MENU_PREFIX */ -+ setenv ("XDG_MENU_PREFIX", "gnome-", 0); -+ -+ xdgMenuPrefix = getenv ("XDG_MENU_PREFIX"); -+ applicationsMenu = g_strconcat (xdgMenuPrefix, "applications.menu", NULL); -+ -+ menubar->priv->applications_menu = create_applications_menu (applicationsMenu, NULL, TRUE); -+ g_free (applicationsMenu); - - menubar->priv->applications_item = panel_image_menu_item_new (); - gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item), diff --git a/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-button_c b/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-button_c deleted file mode 100644 index 16ddc20f2f2..00000000000 --- a/x11/gnome/panel/patches/patch-gnome-panel_panel-menu-button_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gnome-panel_panel-menu-button_c,v 1.2 2011/09/12 07:28:54 jasper Exp $ ---- gnome-panel/panel-menu-button.c.orig Wed May 18 11:08:41 2011 -+++ gnome-panel/panel-menu-button.c Wed May 18 11:09:10 2011 -@@ -74,7 +74,7 @@ typedef struct { - } MenuPathRootItem; - - static MenuPathRootItem root_items [] = { -- { APPLICATIONS_MENU, "applications", "applications.menu" }, -+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" }, - { GNOMECC_MENU, "gnomecc", "gnomecc.menu" } - }; -