aboutsummaryrefslogtreecommitdiff
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/patch-aa64
-rw-r--r--devel/gnome-vfs/files/patch-ac11
-rw-r--r--devel/gnome-vfs/files/patch-devel-docs::Makefile.in14
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in12
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in12
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in11
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c29
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c19
-rw-r--r--devel/gnome-vfs/files/patch-modules_cdda-method.c26
-rw-r--r--devel/gnome-vfs/files/patch-modules_ssh-method.c10
-rw-r--r--devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in11
-rw-r--r--devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c11
12 files changed, 0 insertions, 230 deletions
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
deleted file mode 100644
index 9cad28559cc4..000000000000
--- a/devel/gnome-vfs/files/patch-aa
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure.orig Mon Mar 31 06:11:24 2003
-+++ configure Mon Mar 31 18:06:17 2003
-@@ -8344,6 +8344,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13091,8 +13092,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5
-+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
- if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13112,11 +13113,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char bzCompressInit ();
-+char BZ2_bzCompressInit ();
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
- ;
- return 0;
- }
-@@ -13858,7 +13859,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
-- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -13914,9 +13915,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
-
-
-@@ -15904,6 +15905,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
deleted file mode 100644
index 9362cac1715f..000000000000
--- a/devel/gnome-vfs/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig Tue May 6 15:39:48 2003
-+++ modules/Makefile.in Tue May 6 15:41:28 2003
-@@ -210,7 +210,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS =
-
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
-
- modules_LTLIBRARIES = \
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index b02290aa2ebb..000000000000
--- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1
-+++ devel-docs/Makefile.in 2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES = gnome-vfs-mime-type-handling.txt
-
-
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
deleted file mode 100644
index c75f0d973243..000000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1
-+++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system libraries
- Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
deleted file mode 100644
index f9b09d46b7a3..000000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1
-+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system module include info
- Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index 764a5a6f218a..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/Makefile.in.orig Mon Oct 13 10:31:12 2003
-+++ libgnomevfs/Makefile.in Mon Oct 13 10:31:37 2003
-@@ -234,7 +234,7 @@
- # CLEANFILES = $(BUILT_SOURCES)
-
- # Platform specific includes
--libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
-+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
- libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
-
-
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
deleted file mode 100644
index bd679de032d2..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1
-+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24
-@@ -940,6 +940,8 @@
- static void
- gnome_vfs_application_registry_init (void)
- {
-+ gchar *tmp;
-+
- if (gnome_vfs_application_registry_initialized)
- return;
-
-@@ -961,6 +963,14 @@
- gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry");
- gnome_registry_dir.system_dir = TRUE;
-
-+ tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL);
-+ if (mkdir (tmp, 0700) &&
-+ errno != EEXIST) {
-+ g_warning("Could not create per-user Gnome configuration directory: %s",
-+ tmp);
-+ }
-+ g_free(tmp);
-+
- user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL);
- user_registry_dir.system_dir = FALSE;
-
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 8f8f15be3918..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 25 06:52:18 2003
-+++ libgnomevfs/gnome-vfs-utils.c Tue May 6 15:44:27 2003
-@@ -42,6 +42,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -840,7 +841,7 @@
- paths = g_strsplit (gnome_var, ":", 0);
-
- for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
-- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
- g_strfreev (paths);
- return full_filename;
diff --git a/devel/gnome-vfs/files/patch-modules_cdda-method.c b/devel/gnome-vfs/files/patch-modules_cdda-method.c
deleted file mode 100644
index d1692cc03e47..000000000000
--- a/devel/gnome-vfs/files/patch-modules_cdda-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/cdda-method.c.orig Wed Jan 22 13:54:31 2003
-+++ modules/cdda-method.c Wed Jan 22 13:54:33 2003
-@@ -623,7 +623,11 @@
- // Check and see if we already have opened and stashed this drive
- if (!use_base) {
- if (global_context != NULL) {
-+#ifdef Linux
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#elif defined(__FreeBSD__)
-+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#endif
- use_cache = TRUE;
- cdda_close (drive);
- gnome_vfs_file_info_copy (file_info, global_context->file_info);
-@@ -709,7 +713,11 @@
- if (!use_base) {
- // Check for cache
- if (global_context != NULL) {
-+#ifdef Linux
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#elif defined(__FreeBSD__)
-+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#endif
- // Clear old cache
- cdda_context_free (global_context);
- global_context = cdda_context_new (drive, uri);
diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
deleted file mode 100644
index 14b2cf886863..000000000000
--- a/devel/gnome-vfs/files/patch-modules_ssh-method.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002
-+++ modules/ssh-method.c Mon Jun 10 13:28:51 2002
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <unistd.h>
-
- typedef struct {
diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
deleted file mode 100644
index 13ce7838798d..000000000000
--- a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003
-@@ -19,7 +19,7 @@
- <MergeDir>/usr/share/gnome/apps/</MergeDir>
-
- <!-- Merge dirs optional -->
-- <MergeDir>/etc/X11/applnk/</MergeDir>
-+ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
-
- <!-- Root folder -->
- <Folder>
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,