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/patch-Makefile.in10
-rw-r--r--devel/gnome-vfs/files/patch-ac11
-rw-r--r--devel/gnome-vfs/files/patch-config.h.in12
-rw-r--r--devel/gnome-vfs/files/patch-configure82
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in9
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in9
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in11
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c26
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c12
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c131
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c11
-rw-r--r--devel/gnome-vfs/files/patch-modules_file-method.c12
15 files changed, 366 insertions, 0 deletions
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
new file mode 100644
index 000000000..8c0d2a131
--- /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-ac b/devel/gnome-vfs/files/patch-ac
new file mode 100644
index 000000000..383987654
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ac
@@ -0,0 +1,11 @@
+--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005
++++ modules/Makefile.in Mon Oct 3 11:55:55 2005
+@@ -465,7 +465,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
+ @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_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 = \
+ $(CDDA_LTLIBS) \
diff --git a/devel/gnome-vfs/files/patch-config.h.in b/devel/gnome-vfs/files/patch-config.h.in
new file mode 100644
index 000000000..70edbcd45
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig Sun May 7 00:54:09 2006
++++ config.h.in Sun May 7 00:54:46 2006
+@@ -121,6 +121,9 @@
+ /* Define to 1 if you have the <fnmatch.h> header file. */
+ #undef HAVE_FNMATCH_H
+
++/* Define to 1 if you have the <sys/sysmacros.h> header file. */
++#undef HAVE_SYS_SYSMACROS_H
++
+ /* Define to 1 if you have the <fstab.h> header file. */
+ #undef HAVE_FSTAB_H
+
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
new file mode 100644
index 000000000..8835cb06b
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-configure
@@ -0,0 +1,82 @@
+--- configure.orig Wed May 17 11:33:28 2006
++++ configure Wed May 17 21:44:26 2006
+@@ -23540,6 +23540,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++ ac_check_lib_save_LIBS=$LIBS
++ LIBS="-lintl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23622,6 +23624,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -23629,6 +23632,7 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+ have_ngettext=yes
+ else
+ echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+@@ -25026,7 +25030,7 @@
+
+
+
+-for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
++for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -33396,7 +33400,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 -lcrypto"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -33694,7 +33698,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 -lcrypto"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -37536,6 +37540,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/statfs.h>
+ #include <sys/fstyp.h>
+ _ACEOF
+@@ -37577,6 +37584,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/statfs.h>
+ #include <sys/vmount.h>
+ _ACEOF
+@@ -39016,6 +39026,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-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
new file mode 100644
index 000000000..088433c51
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
++++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system libraries
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-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..c3f0d2c30
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
++++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system module include info
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-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..2747466f7
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
@@ -0,0 +1,26 @@
+--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005
++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005
+@@ -943,6 +943,8 @@ load_application_info (void)
+ static void
+ gnome_vfs_application_registry_init (void)
+ {
++ gchar *tmp;
++
+ if (gnome_vfs_application_registry_initialized)
+ return;
+
+@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi
+ "application-registry",
+ NULL);
+ 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_build_filename (g_get_home_dir(),
+ ".gnome",
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
new file mode 100644
index 000000000..1636ca99d
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006
++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+
+ #ifndef G_OS_WIN32
++#include <sys/socket.h>
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
new file mode 100644
index 000000000..05dd579ba
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
@@ -0,0 +1,12 @@
+--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Sun May 7 01:07:27 2006
++++ libgnomevfs/gnome-vfs-hal-mounts.c Sun May 7 01:07:42 2006
+@@ -32,7 +32,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <limits.h>
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c
new file mode 100644
index 000000000..11d73973b
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c
@@ -0,0 +1,131 @@
+--- libgnomevfs/gnome-vfs-monitor.c.orig Fri May 12 20:46:39 2006
++++ libgnomevfs/gnome-vfs-monitor.c Fri May 12 22:29:57 2006
+@@ -48,9 +48,6 @@
+
+ GList *pending_callbacks; /* protected by handle_hash */
+ guint pending_timeout; /* protected by handle_hash */
+- guint timeout_count; /* count up each time pending_timeout is changed
+- to avoid timeout remove race.
+- protected by handle_hash */
+ };
+
+ struct GnomeVFSMonitorCallbackData {
+@@ -69,6 +66,9 @@
+ static GHashTable *handle_hash = NULL;
+ G_LOCK_DEFINE_STATIC (handle_hash);
+
++static gint actually_dispatch_callback (gpointer data);
++static guint32 get_min_delay (GList *list, gint32 now);
++
+ static void
+ init_hash_table (void)
+ {
+@@ -202,17 +202,25 @@
+ return result;
+ }
+
++static void
++install_timeout (GnomeVFSMonitorHandle *monitor_handle, time_t now)
++{
++ guint32 delay;
+
+-typedef struct {
+- guint timeout_count;
+- GnomeVFSMonitorHandle *monitor_handle;
+-} DispatchData;
++ if (monitor_handle->pending_timeout)
++ g_source_remove (monitor_handle->pending_timeout);
++
++ delay = get_min_delay (monitor_handle->pending_callbacks, now);
++ if (delay == 0)
++ monitor_handle->pending_timeout = g_idle_add (actually_dispatch_callback, monitor_handle);
++ else
++ monitor_handle->pending_timeout = g_timeout_add (delay * 1000, actually_dispatch_callback, monitor_handle);
++}
+
+ static gint
+ actually_dispatch_callback (gpointer data)
+ {
+- DispatchData *ddata = data;
+- GnomeVFSMonitorHandle *monitor_handle = ddata->monitor_handle;
++ GnomeVFSMonitorHandle *monitor_handle = data;
+ GnomeVFSMonitorCallbackData *callback_data;
+ gchar *uri;
+ GList *l, *next;
+@@ -228,13 +236,6 @@
+
+ G_LOCK (handle_hash);
+
+- /* Don't clear pending_timeout if we started another timeout
+- * (and removed this)
+- */
+- if (monitor_handle->timeout_count == ddata->timeout_count) {
+- monitor_handle->pending_timeout = 0;
+- }
+-
+ if (!monitor_handle->cancelled) {
+ /* Find all callbacks that needs to be dispatched */
+ dispatch = NULL;
+@@ -305,13 +306,17 @@
+
+ }
+
+- /* if we were waiting for this callback to be dispatched to free
+- * this monitor, then do it now.
+- */
+- if (monitor_handle->cancelled &&
+- no_live_callbacks (monitor_handle)) {
+- destroy_monitor_handle (monitor_handle);
+- }
++ if (no_live_callbacks (monitor_handle)) {
++ /* if we were waiting for this callback to be dispatched
++ * to free this monitor, then do it now.
++ */
++ if (monitor_handle->cancelled)
++ destroy_monitor_handle (monitor_handle);
++ else
++ monitor_handle->pending_timeout = 0;
++ } else
++ /* pending callbacks left, install another timeout */
++ install_timeout (monitor_handle, now);
+
+ G_UNLOCK (handle_hash);
+
+@@ -375,9 +380,7 @@
+ GnomeVFSMonitorHandle *monitor_handle;
+ char *uri;
+ time_t now;
+- guint32 delay;
+ GList *l;
+- DispatchData *ddata;
+
+ g_return_if_fail (info_uri != NULL);
+
+@@ -435,26 +438,7 @@
+ monitor_handle->pending_callbacks =
+ g_list_append(monitor_handle->pending_callbacks, callback_data);
+
+- delay = get_min_delay (monitor_handle->pending_callbacks, now);
+-
+- if (monitor_handle->pending_timeout) {
+- g_source_remove (monitor_handle->pending_timeout);
+- }
+-
+- ddata = g_new (DispatchData, 1);
+- ddata->monitor_handle = monitor_handle;
+- ddata->timeout_count = ++monitor_handle->timeout_count;
+-
+- if (delay == 0) {
+- monitor_handle->pending_timeout = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+- actually_dispatch_callback,
+- ddata, (GDestroyNotify)g_free);
+- } else {
+- monitor_handle->pending_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
+- delay * 1000,
+- actually_dispatch_callback,
+- ddata, (GDestroyNotify)g_free);
+- }
++ install_timeout (monitor_handle, now);
+ }
+
+ g_free (uri);
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..068d1773a
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005
++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005
+@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
+ for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
+ full_filename = g_build_filename (*temp_paths,
+ "share",
++ "gnome",
+ "pixmaps",
+ relative_filename,
+ NULL);
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
new file mode 100644
index 000000000..dc1259ac4
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005
++++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005
+@@ -25,6 +25,7 @@
+
+ #include <sys/types.h>
+ #include <errno.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <glib.h>
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
new file mode 100644
index 000000000..37cc69f1e
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005
++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005
+@@ -234,7 +234,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
+
+ ptr = xdg_data_dirs;
+
diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c
new file mode 100644
index 000000000..dbb237226
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_file-method.c
@@ -0,0 +1,12 @@
+--- modules/file-method.c.orig Sun May 22 23:30:16 2005
++++ modules/file-method.c Sun May 22 23:31:08 2005
+@@ -66,6 +66,9 @@
+ #if HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #elif HAVE_SYS_MOUNT_H
++#if HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/mount.h>
+ #endif
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:57:32 +0800