[csw-devel] SF.net SVN: gar:[18599] csw/mgar/pkg/gnome-base/gnomevfs2/trunk

[chninkel at users.sourceforge.net]

Revision: 18599
          http://gar.svn.sourceforge.net/gar/?rev=18599&view=rev
Author:   chninkel
Date:     2012-06-28 23:07:33 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
gnome-base/gnomevfs2/trunk: added a patch to fix the unresolved symbol error

Modified Paths:
--------------
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch

Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-06-28 22:27:55 UTC (rev 18598)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-06-28 23:07:33 UTC (rev 18599)
@@ -12,6 +12,11 @@
 DISTNAME = $(GNOME_PROJ)-$(VERSION)
 DISTFILES = $(DISTNAME).tar.bz2
 
+# The smbc_remove_unused_server function has been deprecated in samba 3.2 
+# but gnomevfs code has not been updated: https://bugzilla.gnome.org/show_bug.cgi?id=592341
+# Let's try to use instead the new function
+PATCHFILES = 0002-dont-use-smbc_remove_unused_server.patch
+
 # New glib only available on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Added: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch	                        (rev 0)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch	2012-06-28 23:07:33 UTC (rev 18599)
@@ -0,0 +1,35 @@
+From 120ab4e1fe400d4fb9b8202f0eee10b5b1f493fd Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 29 Jun 2012 00:42:48 +0200
+Subject: [PATCH] Don't use the anymore the smbc_remove_unused_server
+ deprecated function
+
+---
+ modules/smb-method.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/smb-method.c b/modules/smb-method.c
+index 42d6c78..e6bb59e 100644
+--- a/modules/smb-method.c
++++ b/modules/smb-method.c
+@@ -328,7 +328,7 @@ cache_reap_cb (void)
+ 	g_hash_table_foreach (server_cache, add_old_servers, servers);
+ 		
+ 	for (i = 0; i < servers->len; i++) {
+-		smbc_remove_unused_server (smb_context,
++		smbc_getFunctionRemoveUnusedServer(smb_context) (smb_context,
+ 					   (SMBCSRV *)g_ptr_array_index (servers, i));
+ 	}
+ 
+@@ -491,7 +491,7 @@ purge_cached(SMBCCTX * context)
+ 		
+ 	could_not_purge_all = FALSE;
+ 	for (i = 0; i < servers->len; i++) {
+-		if (smbc_remove_unused_server(context,
++		if (smbc_getFunctionRemoveUnusedServer(context)(context,
+ 					      (SMBCSRV *)g_ptr_array_index (servers, i))) {
+ 			/* could not be removed */
+ 			could_not_purge_all = TRUE;
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.