diff options
Diffstat (limited to 'devel/gnomevfs2/files')
| -rw-r--r-- | devel/gnomevfs2/files/patch-aa | 43 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c | 22 |
2 files changed, 34 insertions, 31 deletions
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index 9cad28559..8c07fab8e 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 31 06:11:24 2003 -+++ configure Mon Mar 31 18:06:17 2003 -@@ -8344,6 +8344,7 @@ +--- configure.orig Fri Jan 30 06:09:41 2004 ++++ configure Fri Jan 30 15:33:43 2004 +@@ -20062,6 +20062,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,32 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -13091,8 +13092,8 @@ +@@ -22816,6 +22817,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 +@@ -22898,6 +22901,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 +@@ -22905,6 +22909,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++ LIBS="-lintl $LIBS" + have_ngettext=yes + fi + done +@@ -26396,8 +26401,8 @@ done fi @@ -19,7 +44,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13112,11 +13113,11 @@ +@@ -26416,11 +26421,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -33,16 +58,16 @@ ; return 0; } -@@ -13858,7 +13859,7 @@ +@@ -27547,7 +27552,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 @@ + _ACEOF +@@ -27613,9 +27618,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -54,7 +79,7 @@ fi -@@ -15904,6 +15905,7 @@ +@@ -30543,6 +30548,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c deleted file mode 100644 index 21ce33515..000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libgnomevfs/xdgmime.c.orig Wed Jan 7 13:44:02 2004 -+++ libgnomevfs/xdgmime.c Tue Jan 13 01:55:41 2004 -@@ -97,7 +97,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%LOCALBASE%%/share/:/usr/share/"; - - ptr = xdg_data_dirs; - -@@ -121,8 +121,9 @@ - len = end_ptr - ptr; - else - len = end_ptr - ptr + 1; -- dir = malloc (len); -+ dir = malloc (len + 1); - strncpy (dir, ptr, len); -+ dir[len] = '\0'; - _xdg_mime_init_from_directory (dir); - free (dir); - |