summaryrefslogtreecommitdiff
path: root/x11/gnome-menus/files/patch-layout::applications.menu
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-01-10 05:22:13 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-01-10 05:22:13 +0000
commit610ae5681637c1051a0c17b54e29d97f53da2f3a (patch)
treec231a1eb74b07e444fa7363012cb84bf23d83ce0 /x11/gnome-menus/files/patch-layout::applications.menu
parentAdd a new framework for browser plugins, USE_WEBPLUGINS. It is for which foo (diff)
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790
Notes
Notes: svn path=/head/; revision=225629
Diffstat (limited to 'x11/gnome-menus/files/patch-layout::applications.menu')
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu171
1 files changed, 58 insertions, 113 deletions
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 85533b6d6c0e..116dad13f19b 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,8 +1,8 @@
---- layout/applications.menu.orig Sun Jul 8 18:04:11 2007
-+++ layout/applications.menu Sun Jul 8 18:04:35 2007
-@@ -6,24 +6,26 @@
+--- layout/applications.menu.orig 2008-04-21 15:49:29.000000000 -0400
++++ layout/applications.menu 2008-04-28 14:51:24.000000000 -0400
+@@ -6,9 +6,8 @@
<Name>Applications</Name>
- <Directory>Applications.directory</Directory>
+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
@@ -12,161 +12,106 @@
<LegacyDir>/usr/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from applications-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Accessories submenu -->
- <Menu>
- <Name>Accessories</Name>
- <Directory>Accessories.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Utility</Category>
- <Not>
- <Category>System</Category>
-@@ -38,6 +40,12 @@
- <Directory>Accessibility.directory</Directory>
- <Include>
+@@ -31,6 +30,8 @@
+ applications here -->
+ <Not><Category>Accessibility</Category></Not>
+ <Not><Category>System</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessories -->
+@@ -43,6 +44,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Accessibility</Category>
- <Not>
- <Category>Settings</Category>
-@@ -52,6 +60,12 @@
- <Directory>Development.directory</Directory>
+ <Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessibility -->
+@@ -54,6 +57,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Development</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
<Filename>emacs.desktop</Filename>
-@@ -64,6 +78,12 @@
- <Directory>Education.directory</Directory>
+ </Include>
+@@ -66,6 +71,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Education</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -75,6 +95,12 @@
- <Directory>Games.directory</Directory>
+ </Menu> <!-- End Education -->
+@@ -77,6 +84,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Game</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -86,6 +112,12 @@
- <Directory>Graphics.directory</Directory>
+ </Menu> <!-- End Games -->
+@@ -88,6 +97,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Graphics</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -97,6 +129,12 @@
- <Directory>Internet.directory</Directory>
+ </Menu> <!-- End Graphics -->
+@@ -99,6 +110,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Network</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -108,6 +146,12 @@
- <Directory>Multimedia.directory</Directory>
+ </Menu> <!-- End Internet -->
+@@ -110,6 +123,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>AudioVideo</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -119,6 +163,12 @@
- <Directory>Office.directory</Directory>
+ </Menu> <!-- End Multimedia -->
+@@ -121,6 +136,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Office</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -130,6 +180,12 @@
- <Directory>System-Tools.directory</Directory>
- <Include>
+ </Menu> <!-- End Office -->
+@@ -133,6 +150,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
-@@ -143,11 +199,204 @@
- <OnlyUnallocated/>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
+ </Include>
+ </Menu> <!-- End System Tools -->
+@@ -147,8 +166,197 @@
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
-+
+
+ <!-- Read in overrides and child menus from applications-merged/ -->
+ <DefaultMergeDirs/>
+
@@ -353,5 +298,5 @@
+ </Include>
+ </Menu> <!-- End KOther -->
+ </Menu> <!-- KDE -->
-
++
</Menu> <!-- End Applications -->