diff options
author | drochner <drochner> | 2010-10-22 20:11:16 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-10-22 20:11:16 +0000 |
commit | 84c64c139dccf3f5156b8ad114fa662f0836fda6 (patch) | |
tree | 924d8e51ddb3ac8f3ed2a9508a77811ecd280c1b /sysutils/gnome-vfs | |
parent | 4e2a4d3736f4341131ead740c0fad312aa43a27e (diff) | |
download | pkgsrc-84c64c139dccf3f5156b8ad114fa662f0836fda6.tar.gz |
update to 2.24.4
changes:
-Fix for non-writable home directory
-Fix a crash on Solaris
-translation updates
Diffstat (limited to 'sysutils/gnome-vfs')
-rw-r--r-- | sysutils/gnome-vfs/Makefile | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs/distinfo | 10 | ||||
-rw-r--r-- | sysutils/gnome-vfs/patches/patch-ae | 53 |
4 files changed, 30 insertions, 41 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index df172a0cb71..db26f7b882d 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2010/09/14 11:01:11 wiz Exp $ - -PKGREVISION= 2 +# $NetBSD: Makefile,v 1.81 2010/10/22 20:11:16 drochner Exp $ PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index fd3b04eaffc..a1b8d6ec10d 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.24 2010/06/11 13:25:27 drochner Exp $ +# $NetBSD: Makefile.common,v 1.25 2010/10/22 20:11:16 drochner Exp $ # # used by audio/gnome-vfs-cdda/Makefile # used by net/gnome-vfs-dns-sd/Makefile # used by net/gnome-vfs-smb/Makefile -GNOME_VFS_VERSION= 2.24.3 +GNOME_VFS_VERSION= 2.24.4 DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} CATEGORIES?= sysutils diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo index 42b021c609f..2cafb6115b9 100644 --- a/sysutils/gnome-vfs/distinfo +++ b/sysutils/gnome-vfs/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.30 2010/06/11 13:25:27 drochner Exp $ +$NetBSD: distinfo,v 1.31 2010/10/22 20:11:16 drochner Exp $ -SHA1 (gnome-vfs-2.24.3.tar.bz2) = 56aed067eea79175bc186a00003c07a42e5e9aa6 -RMD160 (gnome-vfs-2.24.3.tar.bz2) = 652afba47a33b05128d354927d2648b39b50f35a -Size (gnome-vfs-2.24.3.tar.bz2) = 1830456 bytes +SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961 +RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b +Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ae) = 414d92d95694cd45bad7a34c381e55a46e3e8eae +SHA1 (patch-ae) = 2e46f1311674265d2054c7209aa057d8da2aca67 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae index 3a1b50ac915..d3397f8d642 100644 --- a/sysutils/gnome-vfs/patches/patch-ae +++ b/sysutils/gnome-vfs/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.9 2009/07/03 16:05:28 drochner Exp $ +$NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $ ---- configure.orig 2009-03-17 14:55:00.000000000 +0100 +--- configure.orig 2010-09-28 09:35:20.000000000 +0000 +++ configure -@@ -25874,7 +25874,7 @@ fi - +@@ -14875,7 +14875,7 @@ _ACEOF + fi -for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap +for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -27109,9 +27109,11 @@ cat >>conftest.$ac_ext <<_ACEOF + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +@@ -15143,9 +15143,11 @@ $as_echo_n "checking number of arguments int main () { @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.9 2009/07/03 16:05:28 drochner Exp $ return 0; } _ACEOF -@@ -34453,7 +34455,7 @@ _ACEOF +@@ -17533,7 +17535,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con msg_samba="yes" if test x$with_samba_libs != x/usr/lib; then @@ -32,39 +32,39 @@ $NetBSD: patch-ae,v 1.9 2009/07/03 16:05:28 drochner Exp $ else SAMBA_LIBS="-lsmbclient" fi -@@ -37509,12 +37511,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then +@@ -19370,12 +19372,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` + pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` else pkg_failed=yes fi -@@ -37525,12 +37527,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then +@@ -19386,12 +19388,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` + pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` else pkg_failed=yes fi -@@ -37548,14 +37550,14 @@ else +@@ -19411,14 +19413,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -77,17 +77,8 @@ $NetBSD: patch-ae,v 1.9 2009/07/03 16:05:28 drochner Exp $ # Put the nasty error message in config.log where it belongs echo "$LIBGNOMEVFS_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: - - $LIBGNOMEVFS_PKG_ERRORS - -@@ -37566,7 +37568,7 @@ Alternatively, you may set the environme - and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: -+$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: +- as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: ++ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: $LIBGNOMEVFS_PKG_ERRORS |