diff options
author | marcus <marcus@FreeBSD.org> | 2005-04-02 22:54:04 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2005-04-02 22:54:04 +0000 |
commit | 11d064c3b390a04ff8df2a3bc5dd753c2cf0c5c1 (patch) | |
tree | 845c6395b962dcfb2083df502f9fa63b19cec3a4 /x11/gnome-menus | |
parent | 67889525a7d00446468d333bd5cf3989441c461c (diff) | |
download | FreeBSD-ports-11d064c3b390a04ff8df2a3bc5dd753c2cf0c5c1.zip FreeBSD-ports-11d064c3b390a04ff8df2a3bc5dd753c2cf0c5c1.tar.gz |
* Update to 2.10.1
* Clean up KDE menu for KDE 3.4 [1]
* Fix a bug, if a .desktop is in ${X11BASE}/share/gnome/app/ it will
display an entry in 'Applications' and in 'Desktop' menu. Disable the
LegacyDirs option in the settings.menu to fix it [1]
Submitted by: mezz [1]
Diffstat (limited to 'x11/gnome-menus')
-rw-r--r-- | x11/gnome-menus/Makefile | 3 | ||||
-rw-r--r-- | x11/gnome-menus/distinfo | 4 | ||||
-rw-r--r-- | x11/gnome-menus/files/KDE.directory | 2 | ||||
-rw-r--r-- | x11/gnome-menus/files/patch-layout::applications.menu | 42 | ||||
-rw-r--r-- | x11/gnome-menus/files/patch-layout::settings.menu | 17 | ||||
-rw-r--r-- | x11/gnome-menus/files/patch-libmenu::menu-tree.c | 24 |
6 files changed, 56 insertions, 36 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 244555a..37d2f96 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -6,7 +6,8 @@ # PORTNAME= gnome-menus -PORTVERSION= 2.10.0 +PORTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index cf1ecb3..d08685a 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-menus-2.10.0.tar.bz2) = 7c0776f79dcd08de97de2b6f9c17c830 -SIZE (gnome2/gnome-menus-2.10.0.tar.bz2) = 337595 +MD5 (gnome2/gnome-menus-2.10.1.tar.bz2) = 83d9695a35ed2215620e8773ee918b8a +SIZE (gnome2/gnome-menus-2.10.1.tar.bz2) = 339964 diff --git a/x11/gnome-menus/files/KDE.directory b/x11/gnome-menus/files/KDE.directory index 032126bb..d8cacb7 100644 --- a/x11/gnome-menus/files/KDE.directory +++ b/x11/gnome-menus/files/KDE.directory @@ -1,5 +1,5 @@ [Desktop Entry] Name=KDE Comment=Some comment about KDE menu -Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png Type=Directory diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu index 6f8b1fb..a364474 100644 --- a/x11/gnome-menus/files/patch-layout::applications.menu +++ b/x11/gnome-menus/files/patch-layout::applications.menu @@ -1,6 +1,17 @@ ---- layout/applications.menu.orig Fri Jan 14 14:17:53 2005 -+++ layout/applications.menu Tue Mar 1 01:28:57 2005 -@@ -15,15 +15,18 @@ +--- layout/applications.menu.orig Wed Mar 9 11:49:53 2005 ++++ layout/applications.menu Fri Mar 25 11:45:09 2005 +@@ -6,24 +6,26 @@ + <Name>Applications</Name> + <Directory>Applications.directory</Directory> + +- <!-- Scan legacy dirs first, as later items take priority --> +- <KDELegacyDirs/> +- <LegacyDir>/etc/X11/applnk</LegacyDir> ++ <!-- Scan legacy dirs first, as later items take priority ++ <LegacyDir>/etc/X11/applnk</LegacyDir> --> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> + + <!-- Read standard .directory and .desktop file locations --> <DefaultAppDirs/> <DefaultDirectoryDirs/> @@ -22,7 +33,7 @@ <Category>Utility</Category> <Not> <Category>System</Category> -@@ -38,6 +41,12 @@ +@@ -38,6 +40,12 @@ <Directory>Accessibility.directory</Directory> <Include> <And> @@ -35,7 +46,7 @@ <Category>Accessibility</Category> <Not> <Category>Settings</Category> -@@ -52,6 +61,12 @@ +@@ -52,6 +60,12 @@ <Directory>Development.directory</Directory> <Include> <And> @@ -48,7 +59,7 @@ <Category>Development</Category> </And> <Filename>emacs.desktop</Filename> -@@ -64,6 +79,12 @@ +@@ -64,6 +78,12 @@ <Directory>Edutainment.directory</Directory> <Include> <And> @@ -61,7 +72,7 @@ <Category>Education</Category> </And> </Include> -@@ -75,6 +96,12 @@ +@@ -75,6 +95,12 @@ <Directory>Games.directory</Directory> <Include> <And> @@ -74,7 +85,7 @@ <Category>Game</Category> </And> </Include> -@@ -86,6 +113,12 @@ +@@ -86,6 +112,12 @@ <Directory>Graphics.directory</Directory> <Include> <And> @@ -87,7 +98,7 @@ <Category>Graphics</Category> </And> </Include> -@@ -97,6 +130,12 @@ +@@ -97,6 +129,12 @@ <Directory>Internet.directory</Directory> <Include> <And> @@ -100,7 +111,7 @@ <Category>Network</Category> </And> </Include> -@@ -108,6 +147,12 @@ +@@ -108,6 +146,12 @@ <Directory>Multimedia.directory</Directory> <Include> <And> @@ -113,7 +124,7 @@ <Category>AudioVideo</Category> </And> </Include> -@@ -119,6 +164,12 @@ +@@ -119,6 +163,12 @@ <Directory>Office.directory</Directory> <Include> <And> @@ -126,7 +137,7 @@ <Category>Office</Category> </And> </Include> -@@ -130,6 +181,12 @@ +@@ -130,6 +180,12 @@ <Directory>System-Tools.directory</Directory> <Include> <And> @@ -139,7 +150,7 @@ <Category>System</Category> <Not><Category>Settings</Category></Not> </And> -@@ -143,11 +200,207 @@ +@@ -143,11 +199,204 @@ <OnlyUnallocated/> <Include> <And> @@ -161,6 +172,7 @@ + + <!-- KDE --> + <Menu> ++ <KDELegacyDirs/> + <Name>KDE</Name> + <Directory>KDE.directory</Directory> + @@ -302,10 +314,6 @@ + </Or> + <Or> + <Category>Office</Category> -+ <Category>Spreadsheet</Category> -+ <Category>WordProcessor</Category> -+ <Category>Calendar</Category> -+ <Category>ProjectManagement</Category> + </Or> + </And> + </Include> diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu index 266678d..f11dd6a 100644 --- a/x11/gnome-menus/files/patch-layout::settings.menu +++ b/x11/gnome-menus/files/patch-layout::settings.menu @@ -1,6 +1,17 @@ ---- layout/settings.menu.orig Wed Jan 5 20:12:16 2005 -+++ layout/settings.menu Tue Mar 1 01:28:57 2005 -@@ -15,9 +15,6 @@ +--- layout/settings.menu.orig Wed Mar 9 11:49:53 2005 ++++ layout/settings.menu Fri Mar 25 11:45:22 2005 +@@ -6,18 +6,15 @@ + <Name>Settings</Name> + <Directory>Settings.directory</Directory> + +- <!-- Scan legacy dirs first, as later items take priority --> ++ <!-- Scan legacy dirs first, as later items take priority + <KDELegacyDirs/> + <LegacyDir>/etc/X11/applnk</LegacyDir> +- <LegacyDir>/usr/share/gnome/apps</LegacyDir> ++ <LegacyDir>/usr/share/gnome/apps</LegacyDir> --> + + <!-- Read standard .directory and .desktop file locations --> <DefaultAppDirs/> <DefaultDirectoryDirs/> diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c index 9bc6202..2ea5de4 100644 --- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c +++ b/x11/gnome-menus/files/patch-libmenu::menu-tree.c @@ -1,5 +1,5 @@ ---- libmenu/menu-tree.c.orig Tue Mar 1 01:24:07 2005 -+++ libmenu/menu-tree.c Tue Mar 1 01:24:17 2005 +--- libmenu/menu-tree.c.orig Tue Mar 22 05:34:24 2005 ++++ libmenu/menu-tree.c Wed Mar 23 14:34:04 2005 @@ -67,6 +67,12 @@ gpointer user_data; } MenuTreeMonitor; @@ -21,7 +21,7 @@ GSList *subdirs; guint refcount : 24; -@@ -702,17 +709,15 @@ +@@ -747,17 +754,15 @@ } } @@ -42,7 +42,7 @@ while (tmp != NULL) { retval = g_slist_prepend (retval, -@@ -725,6 +730,22 @@ +@@ -770,6 +775,22 @@ } GSList * @@ -65,7 +65,7 @@ menu_tree_directory_get_subdirs (MenuTreeDirectory *directory) { GSList *retval; -@@ -891,6 +912,7 @@ +@@ -936,6 +957,7 @@ retval->name = g_strdup (name); retval->directory_entry = NULL; retval->entries = NULL; @@ -73,7 +73,7 @@ retval->subdirs = NULL; retval->only_unallocated = FALSE; retval->refcount = 1; -@@ -2267,16 +2289,21 @@ +@@ -2488,16 +2510,21 @@ } static void @@ -101,13 +101,13 @@ } static MenuTreeDirectory * -@@ -2290,11 +2317,14 @@ +@@ -2511,11 +2538,14 @@ MenuLayoutNode *layout_iter; MenuTreeDirectory *directory; DesktopEntrySet *entries; + DesktopEntrySet *excluded_entries; - DesktopEntrySet *allocated_set; gboolean deleted; + DesktopEntrySet *allocated_set; gboolean only_unallocated; GSList *tmp; @@ -116,7 +116,7 @@ g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU); g_assert (menu_layout_node_menu_get_name (layout) != NULL); -@@ -2311,6 +2341,7 @@ +@@ -2532,6 +2562,7 @@ dir_dirs = menu_layout_node_menu_get_directory_dirs (layout); entries = desktop_entry_set_new (); @@ -124,7 +124,7 @@ allocated_set = desktop_entry_set_new (); layout_iter = menu_layout_node_get_children (layout); -@@ -2357,6 +2388,7 @@ +@@ -2578,6 +2609,7 @@ if (rule_set != NULL) { desktop_entry_set_union (entries, rule_set); @@ -132,7 +132,7 @@ desktop_entry_set_union (allocated_set, rule_set); desktop_entry_set_unref (rule_set); } -@@ -2389,6 +2421,7 @@ +@@ -2610,6 +2642,7 @@ if (rule_set != NULL) { desktop_entry_set_subtract (entries, rule_set); @@ -140,7 +140,7 @@ desktop_entry_set_unref (rule_set); } -@@ -2488,15 +2521,28 @@ +@@ -2707,15 +2740,28 @@ if (deleted) { desktop_entry_set_unref (entries); |