mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
610ae56816
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
303 lines
7.9 KiB
Plaintext
303 lines
7.9 KiB
Plaintext
--- 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>X-GNOME-Menu-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 -->
|
|
@@ -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>
|
|
<Category>Accessibility</Category>
|
|
<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>
|
|
<Category>Development</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
<Filename>emacs.desktop</Filename>
|
|
</Include>
|
|
@@ -66,6 +71,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>Education</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Education -->
|
|
@@ -77,6 +84,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>Game</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Games -->
|
|
@@ -88,6 +97,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>Graphics</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Graphics -->
|
|
@@ -99,6 +110,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>Network</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Internet -->
|
|
@@ -110,6 +123,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>AudioVideo</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Multimedia -->
|
|
@@ -121,6 +136,8 @@
|
|
<Include>
|
|
<And>
|
|
<Category>Office</Category>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</Include>
|
|
</Menu> <!-- End Office -->
|
|
@@ -133,6 +150,8 @@
|
|
<And>
|
|
<Category>System</Category>
|
|
<Not><Category>Settings</Category></Not>
|
|
+ <Not><Category>Qt</Category></Not>
|
|
+ <Not><Category>KDE</Category></Not>
|
|
</And>
|
|
</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/>
|
|
+
|
|
+ <!-- KDE -->
|
|
+ <Menu>
|
|
+ <KDELegacyDirs/>
|
|
+ <Name>KDE</Name>
|
|
+ <Directory>KDE.directory</Directory>
|
|
+
|
|
+ <!-- KAccessories submenu -->
|
|
+ <Menu>
|
|
+ <Name>Accessories</Name>
|
|
+ <Directory>Accessories.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Utility</Category>
|
|
+ <Not>
|
|
+ <Category>System</Category>
|
|
+ </Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KAccessories -->
|
|
+
|
|
+ <!-- KAccessibility submenu -->
|
|
+ <Menu>
|
|
+ <Name>Accessibility</Name>
|
|
+ <Directory>Accessibility.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Accessibility</Category>
|
|
+ <Not>
|
|
+ <Category>Settings</Category>
|
|
+ </Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KAccessibility -->
|
|
+
|
|
+ <!-- KDevelopment Tools -->
|
|
+ <Menu>
|
|
+ <Name>Development</Name>
|
|
+ <Directory>Development.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Development</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KDevelopment Tools -->
|
|
+
|
|
+ <!-- KEducation -->
|
|
+ <Menu>
|
|
+ <Name>Education</Name>
|
|
+ <Directory>Education.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Education</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KEducation -->
|
|
+
|
|
+ <!-- KGames -->
|
|
+ <Menu>
|
|
+ <Name>Games</Name>
|
|
+ <Directory>Games.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Game</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KGames -->
|
|
+
|
|
+ <!-- KGraphics -->
|
|
+ <Menu>
|
|
+ <Name>Graphics</Name>
|
|
+ <Directory>Graphics.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Graphics</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KGraphics -->
|
|
+
|
|
+ <!-- KInternet -->
|
|
+ <Menu>
|
|
+ <Name>Internet</Name>
|
|
+ <Directory>Internet.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Network</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KInternet -->
|
|
+
|
|
+ <!-- KMultimedia -->
|
|
+ <Menu>
|
|
+ <Name>Multimedia</Name>
|
|
+ <Directory>Multimedia.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>AudioVideo</Category>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KMultimedia -->
|
|
+
|
|
+ <!-- KOffice -->
|
|
+ <Menu>
|
|
+ <Name>Office</Name>
|
|
+ <Directory>Office.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Or>
|
|
+ <Category>Office</Category>
|
|
+ </Or>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu><!-- End KOffice -->
|
|
+
|
|
+ <!-- KSystem Tools-->
|
|
+ <Menu>
|
|
+ <Name>System</Name>
|
|
+ <Directory>System-Tools.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>System</Category>
|
|
+ <Not><Category>Settings</Category></Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KSystem Tools -->
|
|
+
|
|
+ <!-- KOther -->
|
|
+ <Menu>
|
|
+ <Name>Other</Name>
|
|
+ <Directory>Other.directory</Directory>
|
|
+ <OnlyUnallocated/>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Or>
|
|
+ <Category>Qt</Category>
|
|
+ <Category>KDE</Category>
|
|
+ </Or>
|
|
+ <Category>Application</Category>
|
|
+ <Not><Category>Core</Category></Not>
|
|
+ <Not><Category>Settings</Category></Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ </Menu> <!-- End KOther -->
|
|
+ </Menu> <!-- KDE -->
|
|
+
|
|
</Menu> <!-- End Applications -->
|