summaryrefslogtreecommitdiffstats
path: root/devel/gnome-vfs/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnome-vfs/files')
-rw-r--r--devel/gnome-vfs/files/KDE.directory5
-rw-r--r--devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in270
-rw-r--r--devel/gnome-vfs/files/patch-aa14
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c26
4 files changed, 274 insertions, 41 deletions
diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory
new file mode 100644
index 000000000..032126bb9
--- /dev/null
+++ b/devel/gnome-vfs/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
index 17774279b..432558f80 100644
--- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
@@ -1,5 +1,5 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004
-+++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004
+--- modules/vfolder/applications-all-users.vfolder-info.in.orig Tue Feb 10 19:49:19 2004
++++ modules/vfolder/applications-all-users.vfolder-info.in Tue Feb 10 19:59:22 2004
@@ -19,7 +19,14 @@
<MergeDir>/usr/share/gnome/apps/</MergeDir>
@@ -16,3 +16,269 @@
<!-- Root folder -->
<Folder>
+@@ -34,10 +41,12 @@
+ <Query>
+ <And>
+ <Keyword>Core</Keyword>
+- <!-- FIXME: Seth, why would this be wanted? -->
+- <!--<Not>
+- <Keyword>Merged</Keyword>
+- </Not>-->
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ </And>
+ </Query>
+
+@@ -47,6 +56,12 @@
+ <Desktop>Accessories.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Utility</Keyword>
+ <Not>
+@@ -63,6 +78,12 @@
+ <Desktop>Accessibility.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Accessibility</Keyword>
+ <Not>
+@@ -80,6 +101,12 @@
+ <OnlyUnallocated/>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -101,6 +128,12 @@
+ <Desktop>Development.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Development</Keyword>
+ </And>
+@@ -114,6 +147,12 @@
+ <Desktop>Games.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Game</Keyword>
+ </And>
+@@ -127,6 +166,12 @@
+ <Desktop>Graphics.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Graphics</Keyword>
+ </And>
+@@ -140,6 +185,12 @@
+ <Desktop>Internet.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Network</Keyword>
+ </And>
+@@ -153,6 +204,12 @@
+ <Desktop>Multimedia.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>AudioVideo</Keyword>
+ </And>
+@@ -170,6 +227,12 @@
+ <Desktop>Office.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Or>
+ <Keyword>Office</Keyword>
+@@ -195,6 +258,12 @@
+ <Desktop>System.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -204,6 +273,117 @@
+ </Query>
+ <DontShowIfEmpty/>
+ </Folder>
+-
++
++ <!-- KDE -->
++ <Folder>
++ <Name>KDE</Name>
++ <Desktop>KDE.directory</Desktop>
++
++ <!-- KAccessories -->
++ <Folder>
++ <Name>Accessories</Name>
++ <Desktop>Accessories.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Utility</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KDevelopment Tools -->
++ <Folder>
++ <Name>Programming</Name>
++ <Desktop>Development.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Development</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KGraphics -->
++ <Folder>
++ <Name>Graphics</Name>
++ <Desktop>Graphics.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Graphics</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KInternet -->
++ <Folder>
++ <Name>Internet</Name>
++ <Desktop>Internet.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Network</Keyword>
++ </And>
++ </Query>
++
++ <Include>/usr/local/share/applnk/konqueror.desktop</Include>
++
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KMultimedia -->
++ <Folder>
++ <Name>Multimedia</Name>
++ <Desktop>Multimedia.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>AudioVideo</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KOffice -->
++ <Folder>
++ <Name>Office</Name>
++ <Desktop>Office.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Or>
++ <Keyword>Office</Keyword>
++ <Keyword>Spreadsheet</Keyword>
++ <Keyword>WordProcessor</Keyword>
++ <Keyword>Calendar</Keyword>
++ <Keyword>ProjectManagement</Keyword>
++ </Or>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++ </Folder> <!-- KDE -->
++
+ </Folder>
+ </VFolderInfo>
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index ba863aab1..8273ab3fe 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -55,22 +55,10 @@
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27613,9 +27617,9 @@
-
- msg_openssl="yes"
- if test x$with_openssl_libs != x/usr/lib; then
-- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
- else
-- OPENSSL_LIBS="-lssl -lcrypto"
-+ OPENSSL_LIBS="-lssl -lcryptofoo"
- fi
-
-
@@ -30543,6 +30547,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
deleted file mode 100644
index 87e2eca65..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 24 13:53:43 2003
-+++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 24 13:56:15 2003
-@@ -224,12 +224,23 @@
- }
-
- if (info->should_eject) {
-+#ifdef __FreeBSD__
-+ char *argv[5] = {
-+ "cdcontrol",
-+ "-f",
-+ NULL,
-+ "eject",
-+ NULL
-+ };
-+ argv[2] = info->device_path?info->device_path:info->mount_point;
-+#else
- char *argv[3] = {
- "eject",
- NULL,
- NULL
- };
- argv[1] = info->device_path?info->device_path:info->mount_point;
-+#endif
-
- if (g_spawn_sync (NULL,
- argv,
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 19:56:13 +0800