diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-10-24 04:36:24 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-10-24 04:36:24 +0800 |
commit | 97111995648493d9d5116a04a08f8aa8d38ab0c9 (patch) | |
tree | 858de3c0d09b4e819fd226bbb8028ddc3ee5ea61 /devel/gnome-vfs/files | |
parent | f943b38abd1072f4cef65d47e7909d66a224f0e6 (diff) | |
download | marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar.gz marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar.bz2 marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar.lz marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar.xz marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.tar.zst marcuscom-ports-97111995648493d9d5116a04a08f8aa8d38ab0c9.zip |
Update to 2.5.0.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1289 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnome-vfs/files')
13 files changed, 297 insertions, 0 deletions
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa new file mode 100644 index 000000000..9cad28559 --- /dev/null +++ b/devel/gnome-vfs/files/patch-aa @@ -0,0 +1,64 @@ +--- 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 new file mode 100644 index 000000000..9362cac17 --- /dev/null +++ b/devel/gnome-vfs/files/patch-ac @@ -0,0 +1,11 @@ +--- 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-daemon_gnome-vfs-async-daemon.c b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c new file mode 100644 index 000000000..588665856 --- /dev/null +++ b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c @@ -0,0 +1,67 @@ +--- daemon/gnome-vfs-async-daemon.c.orig Thu Oct 23 16:17:06 2003 ++++ daemon/gnome-vfs-async-daemon.c Thu Oct 23 16:19:26 2003 +@@ -23,23 +23,23 @@ + * the context object that has been looked up */ + G_LOCK_DEFINE_STATIC (client_call_context); + +-static GnomeVFSAsyncDaemon *async_daemon = NULL; ++static GnomeVFSAsyncDaemon *g_vfs_async_daemon = NULL; + + static void + gnome_vfs_async_daemon_finalize (GObject *object) + { + /* All client calls should have finished before we kill this object */ +- g_assert (g_hash_table_size (async_daemon->client_call_context) == 0); +- g_hash_table_destroy (async_daemon->client_call_context); ++ g_assert (g_hash_table_size (g_vfs_async_daemon->client_call_context) == 0); ++ g_hash_table_destroy (g_vfs_async_daemon->client_call_context); + BONOBO_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); +- async_daemon = NULL; ++ g_vfs_async_daemon = NULL; + } + + static void + gnome_vfs_async_daemon_instance_init (GnomeVFSAsyncDaemon *daemon) + { + daemon->client_call_context = g_hash_table_new (NULL, NULL); +- async_daemon = daemon; ++ g_vfs_async_daemon = daemon; + } + + GnomeVFSContext * +@@ -48,13 +48,13 @@ + { + GnomeVFSContext *context; + +- if (async_daemon == NULL) { ++ if (g_vfs_async_daemon == NULL) { + return NULL; + } + + context = gnome_vfs_context_new (); + G_LOCK (client_call_context); +- g_hash_table_insert (async_daemon->client_call_context, client_call, context); ++ g_hash_table_insert (g_vfs_async_daemon->client_call_context, client_call, context); + G_UNLOCK (client_call_context); + + gnome_vfs_daemon_add_context (client, context); +@@ -72,8 +72,8 @@ + _gnome_vfs_daemon_set_current_daemon_client_call (NULL); + gnome_vfs_daemon_remove_context (client, context); + G_LOCK (client_call_context); +- if (async_daemon != NULL) { +- g_hash_table_remove (async_daemon->client_call_context, client_call); ++ if (g_vfs_async_daemon != NULL) { ++ g_hash_table_remove (g_vfs_async_daemon->client_call_context, client_call); + } + gnome_vfs_context_free (context); + G_UNLOCK (client_call_context); +@@ -176,7 +176,7 @@ + client_call = data; + + G_LOCK (client_call_context); +- context = g_hash_table_lookup (async_daemon->client_call_context, client_call); ++ context = g_hash_table_lookup (g_vfs_async_daemon->client_call_context, client_call); + if (context != NULL) { + cancellation = gnome_vfs_context_get_cancellation (context); + if (cancellation) { diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in new file mode 100644 index 000000000..a4fe1c9e7 --- /dev/null +++ b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.3 2003/09/18 06:49:30 marcus Exp $ + +--- 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 new file mode 100644 index 000000000..c75a8ae85 --- /dev/null +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -0,0 +1,12 @@ + +$FreeBSD: ports/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in,v 1.3 2003/09/18 06:49:30 marcus Exp $ + +--- 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 new file mode 100644 index 000000000..caa732b1c --- /dev/null +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -0,0 +1,12 @@ + +$FreeBSD: ports/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in,v 1.4 2003/09/18 06:49:30 marcus Exp $ + +--- 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 new file mode 100644 index 000000000..063376961 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in @@ -0,0 +1,11 @@ +--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 ++++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 +@@ -429,7 +429,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 new file mode 100644 index 000000000..f6bb8f9ff --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -0,0 +1,29 @@ + +$FreeBSD: ports/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c,v 1.3 2003/09/18 06:49:30 marcus Exp $ + +--- 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 new file mode 100644 index 000000000..8f8f15be3 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000..d1692cc03 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_cdda-method.c @@ -0,0 +1,26 @@ +--- 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 new file mode 100644 index 000000000..14b2cf886 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_ssh-method.c @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..13ce78387 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..a07d0bc81 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c @@ -0,0 +1,11 @@ +--- 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, |