5 files changed, 22 insertions, 53 deletions

diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index 132cd27555dd..02a91a3ecd9e 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-09-22 14:17:35.000000000 -0400
-+++ Makefile.in	2008-09-22 14:20:32.000000000 -0400
-@@ -505,14 +505,14 @@ uninstall-anjuta_dataDATA:
+--- Makefile.in.orig	2009-09-22 12:00:07.000000000 +0200
++++ Makefile.in	2009-09-22 12:02:56.000000000 +0200
+@@ -434,14 +434,14 @@ uninstall-anjuta_dataDATA:
  	  rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \
  	done
  install-anjutadocDATA: $(anjutadoc_DATA)
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
deleted file mode 100644
index a7165a47d238..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/Makefile.in.orig	2009-02-28 20:29:49.000000000 -0500
-+++ plugins/symbol-db/Makefile.in	2009-02-28 20:29:57.000000000 -0500
-@@ -369,7 +369,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = images test 
-+SUBDIRS = images
- symbol_db_datadir = $(anjuta_data_dir)
- symbol_db_data_DATA = tables.sql
- 
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
deleted file mode 100644
index 10565abef21e..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/plugin.h.orig	2009-04-17 01:02:20.000000000 -0400
-+++ plugins/symbol-db/plugin.h	2009-04-17 01:02:37.000000000 -0400
-@@ -49,7 +49,7 @@ typedef struct _SymbolDBPluginClass Symb
- #include "symbol-db-prefs.h"
- 
- /* a sort of 'default' value for ctags executable. User must have it installed */
--#define CTAGS_PATH			"/usr/bin/ctags"
-+#define CTAGS_PATH			"%%LOCALBASE%%/bin/exctags"
- 
- struct _SymbolDBPlugin {
- 	AnjutaPlugin parent;
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
index 1b6405e7555a..b50d375a1ae4 100644
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
@@ -1,6 +1,6 @@
---- plugins/symbol-db/symbol-db-engine-core.c.orig	2009-03-18 04:24:07.000000000 -0400
-+++ plugins/symbol-db/symbol-db-engine-core.c	2009-04-20 00:40:52.000000000 -0400
-@@ -1486,7 +1486,7 @@ sdb_engine_ctags_output_thread (gpointer
+--- plugins/symbol-db/symbol-db-engine-core.c.orig	2009-08-27 09:17:03.000000000 +0200
++++ plugins/symbol-db/symbol-db-engine-core.c	2009-08-27 17:32:35.000000000 +0200
+@@ -1504,7 +1504,7 @@ sdb_engine_ctags_output_thread (gpointer
  
  			/* found out a new marker */ 
  			marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER);
@@ -9,27 +9,18 @@
  	}
  	else 
  	{
-@@ -1644,7 +1644,7 @@ sdb_engine_ctags_launcher_create (Symbol
- 	anjuta_launcher_set_encoding (priv->ctags_launcher, NULL);
- 		
- 	g_signal_connect (G_OBJECT (priv->ctags_launcher), "child-exited",
--						  G_CALLBACK (on_scan_files_end_1), NULL);
-+						  G_CALLBACK (on_scan_files_end_1), dbe);
- 
- 	exe_string = g_strdup_printf ("%s --sort=no --fields=afmiKlnsStz --c++-kinds=+p "
- 								  "--filter=yes --filter-terminator='"CTAGS_MARKER"'",
-@@ -1810,8 +1810,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
- 		gchar *temp_file;
+@@ -1831,8 +1831,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
+ 		gint i = 0;
  		while (TRUE)
  		{
--			temp_file = g_strdup_printf ("/anjuta-%d_%ld.tags", getpid (),
--								 time (NULL));
-+			temp_file = g_strdup_printf ("%s/anjuta-%d_%ld.tags", SHARED_MEMORY_PREFIX, getpid (),
-+								 (long) time (NULL));
+-			temp_file = g_strdup_printf ("/anjuta-%d_%ld%d.tags", getpid (),
+-								 time (NULL), i++);
++			temp_file = g_strdup_printf ("%s/anjuta-%d_%ld%d.tags", SHARED_MEMORY_PREFIX, getpid (),
++								 (long) time (NULL), i++);
  			gchar *test;
  			test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL);
  			if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE)
-@@ -1831,12 +1831,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
+@@ -1852,12 +1852,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
  		priv->shared_mem_str = temp_file;
  		
  		if ((priv->shared_mem_fd = 
@@ -44,7 +35,7 @@
  		priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b");
  		/*DEBUG_PRINT ("temp_file %s", temp_file);*/
  
-@@ -2419,7 +2419,7 @@ sdb_engine_init (SymbolDBEngine * object
+@@ -2446,7 +2446,7 @@ sdb_engine_init (SymbolDBEngine * object
  static void
  sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data)
  {
@@ -53,7 +44,7 @@
  }
  
  static void 
-@@ -2508,7 +2508,7 @@ sdb_engine_finalize (GObject * object)
+@@ -2535,7 +2535,7 @@ sdb_engine_finalize (GObject * object)
  	
  	if (priv->shared_mem_str)
  	{
@@ -62,7 +53,7 @@
  		g_free (priv->shared_mem_str);
  		priv->shared_mem_str = NULL;
  	}
-@@ -5834,12 +5834,12 @@ symbol_db_engine_update_buffer_symbols (
+@@ -6059,12 +6059,12 @@ symbol_db_engine_update_buffer_symbols (
  		 * target buffer one */
  		base_filename = g_filename_display_basename (relative_path);
  		
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
index 3d9398a872c1..fe850697cfac 100644
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
@@ -1,11 +1,11 @@
---- plugins/symbol-db/symbol-db-prefs.h.orig	2009-04-17 01:06:07.000000000 -0400
-+++ plugins/symbol-db/symbol-db-prefs.h	2009-04-17 01:06:34.000000000 -0400
-@@ -40,7 +40,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
- #include "symbol-db-system.h"
+--- plugins/symbol-db/symbol-db-prefs.h.orig	2009-07-27 16:14:31.000000000 +0200
++++ plugins/symbol-db/symbol-db-prefs.h	2009-07-28 00:10:49.000000000 +0200
+@@ -41,7 +41,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
  
  
+ /*
 -#define CTAGS_PREFS			 "preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags"
-+#define CTAGS_PREFS			 "preferences_entry:text:%%LOCALBASE%%/bin/exctags:0:symboldb.ctags"
++#define CTAGS_PREFS			 "preferences_entry:text:%%LOCALBASE%%/bin/ctags:0:symboldb.ctags"
  #define CTAGS_PREFS_KEY		 "symboldb.ctags"
+  */
  #define PROJECT_AUTOSCAN	 "symboldb.scan_prj_pkgs"
- #define PARALLEL_SCAN		 "symboldb.parallel_scan"