diff options
Diffstat (limited to 'devel/anjuta/files')
9 files changed, 247 insertions, 0 deletions
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in new file mode 100644 index 000000000..132cd2755 --- /dev/null +++ b/devel/anjuta/files/patch-Makefile.in @@ -0,0 +1,25 @@ +--- 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: + rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \ + done + install-anjutadocDATA: $(anjutadoc_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" +- @list='$(anjutadoc_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \ +- $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ +- done ++# @$(NORMAL_INSTALL) ++# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" ++# @list='$(anjutadoc_DATA)'; for p in $$list; do \ ++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++# f=$(am__strip_dir) \ ++# echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \ ++# $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ ++# done + + uninstall-anjutadocDATA: + @$(NORMAL_UNINSTALL) diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in new file mode 100644 index 000000000..a567fda33 --- /dev/null +++ b/devel/anjuta/files/patch-doc::Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2008-08-06 17:40:26.000000000 +0200 ++++ doc/Makefile.in 2008-08-06 17:41:04.000000000 +0200 +@@ -540,7 +540,7 @@ + + info-am: + +-install-data-am: install-anjuta_docDATA install-man ++install-data-am: install-man + + install-dvi: install-dvi-am + diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c new file mode 100644 index 000000000..126c7d9e3 --- /dev/null +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -0,0 +1,76 @@ +--- libanjuta/anjuta-launcher.c.orig 2009-03-18 04:24:10.000000000 -0400 ++++ libanjuta/anjuta-launcher.c 2009-04-16 19:49:25.000000000 -0400 +@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is output */ + { + gchar *utf8_chars = NULL; +@@ -789,6 +790,15 @@ anjuta_launcher_scan_output (GIOChannel + anjuta_launcher_synchronize (launcher); + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ launcher->priv->stdout_is_done = TRUE; ++ anjuta_launcher_synchronize (launcher); ++ if (err) ++ g_error_free (err); ++ return FALSE; ++ } ++ + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); +@@ -818,7 +828,8 @@ anjuta_launcher_scan_error (GIOChannel * + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -844,6 +855,15 @@ anjuta_launcher_scan_error (GIOChannel * + anjuta_launcher_synchronize (launcher); + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ launcher->priv->stderr_is_done = TRUE; ++ anjuta_launcher_synchronize (launcher); ++ if (err) ++ g_error_free (err); ++ return FALSE; ++ } ++ + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); +@@ -873,7 +893,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -902,6 +923,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch + { + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ ret = FALSE; ++ break; ++ } + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in new file mode 100644 index 000000000..a7165a47d --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in @@ -0,0 +1,11 @@ +--- 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.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c new file mode 100644 index 000000000..d19ef6d15 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c @@ -0,0 +1,11 @@ +--- plugins/symbol-db/plugin.c.orig 2009-04-17 01:08:28.000000000 -0400 ++++ plugins/symbol-db/plugin.c 2009-04-17 01:09:11.000000000 -0400 +@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB + GHashTable *prj_elements_hash; + GPtrArray *to_add_files = NULL; + gint i; +- gint real_added ; ++ gint real_added = 0; + + pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell, + IAnjutaProjectManager, NULL); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h new file mode 100644 index 000000000..10565abef --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..1b6405e75 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c @@ -0,0 +1,80 @@ +--- 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 + + /* found out a new marker */ + marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER); +- } while (remaining_chars + len_marker < len_chars || marker_ptr != NULL); ++ } while (remaining_chars > 0 || marker_ptr != NULL); + } + 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; + 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)); + 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 + priv->shared_mem_str = temp_file; + + if ((priv->shared_mem_fd = +- shm_open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) ++ open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) + { + g_warning ("Error while trying to open a shared memory file. Be" + "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs"); + } +- ++ + 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 + static void + sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data) + { +- shm_unlink (key); ++ unlink (key); + } + + static void +@@ -2508,7 +2508,7 @@ sdb_engine_finalize (GObject * object) + + if (priv->shared_mem_str) + { +- shm_unlink (priv->shared_mem_str); ++ unlink (priv->shared_mem_str); + g_free (priv->shared_mem_str); + priv->shared_mem_str = NULL; + } +@@ -5834,12 +5834,12 @@ symbol_db_engine_update_buffer_symbols ( + * target buffer one */ + base_filename = g_filename_display_basename (relative_path); + +- shared_temp_file = g_strdup_printf ("/anjuta-%d-%ld-%s", getpid (), +- time (NULL), base_filename); ++ shared_temp_file = g_strdup_printf ("%s/anjuta-%d-%ld-%s", SHARED_MEMORY_PREFIX, getpid (), ++ (long) time (NULL), base_filename); + g_free (base_filename); + + if ((buffer_mem_fd = +- shm_open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) ++ open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) + { + g_warning ("Error while trying to open a shared memory file. Be" + "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs"); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h new file mode 100644 index 000000000..cecb81021 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h @@ -0,0 +1,11 @@ +--- plugins/symbol-db/symbol-db-engine-priv.h.orig 2009-04-15 19:40:20.000000000 -0400 ++++ plugins/symbol-db/symbol-db-engine-priv.h 2009-04-15 19:40:34.000000000 -0400 +@@ -47,7 +47,7 @@ + + #define CTAGS_MARKER "#_#\n" + +-#define SHARED_MEMORY_PREFIX "/dev/shm" ++#define SHARED_MEMORY_PREFIX "/tmp" + + #define THREADS_MAX_CONCURRENT 2 + #define TRIGGER_SIGNALS_DELAY 100 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 new file mode 100644 index 000000000..3d9398a87 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h @@ -0,0 +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" + + +-#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_KEY "symboldb.ctags" + #define PROJECT_AUTOSCAN "symboldb.scan_prj_pkgs" + #define PARALLEL_SCAN "symboldb.parallel_scan" |