diff options
Diffstat (limited to 'devel/gnome-vfs/files')
7 files changed, 21 insertions, 322 deletions
diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory deleted file mode 100644 index 032126bb99db..000000000000 --- a/devel/gnome-vfs/files/KDE.directory +++ /dev/null @@ -1,5 +0,0 @@ -[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 deleted file mode 100644 index 120a8906411f..000000000000 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,285 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 -@@ -19,7 +19,14 @@ - <MergeDir>/usr/share/gnome/apps/</MergeDir> - - <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> - - <!-- 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,118 @@ - </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> -+ <DontShowIfEmpty/> -+ </Folder> <!-- KDE --> -+ - </Folder> - </VFolderInfo> diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in new file mode 100644 index 000000000000..8c0d2a13160c --- /dev/null +++ b/devel/gnome-vfs/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Nov 30 02:05:26 2004 ++++ Makefile.in Tue Nov 30 02:05:34 2004 +@@ -230,7 +230,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c deleted file mode 100644 index 82e0e5f61891..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 -+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 -@@ -106,7 +106,7 @@ - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; - - data_dir_vector = g_strsplit (data_dirs, ":", 0); - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 5d37cc768ddb..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 -@@ -43,6 +43,7 @@ - #include <errno.h> - #include <string.h> - #include <signal.h> -+#include <poll.h> - #include <libgnomevfs/gnome-vfs.h> - - #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c new file mode 100644 index 000000000000..9c7cb9232cab --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_smb-method.c @@ -0,0 +1,11 @@ +--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 ++++ modules/smb-method.c Tue Jan 11 18:25:03 2005 +@@ -1345,7 +1345,7 @@ + GnomeVFSContext *context) + { + FileHandle *handle = (FileHandle *)method_handle; +- GnomeVFSResult res = GNOME_VFS_OK;; ++ GnomeVFSResult res = GNOME_VFS_OK; + SmbAuthContext actx; + ssize_t n = 0; + diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c deleted file mode 100644 index a07d0bc81b39..000000000000 --- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 -+++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 -@@ -1721,7 +1721,7 @@ - - for (i = 0; ppath[i] != NULL; i++) { - dir = g_build_filename (ppath[i], -- "/share/applications/", -+ "/share/gnome/applications/", - NULL); - id = itemdir_new (info, - dir, |