summaryrefslogtreecommitdiffstats
path: root/devel/anjuta/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-12-23 20:33:28 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-12-23 20:33:28 +0800
commit51b484f9b07e185f12ae1e5664c01612858d41df (patch)
tree1fe246cfea48d021a76864e663279fdb97dfd7a1 /devel/anjuta/files
parenta6ff8f1617558f9ace1b289b03d661ed5fe63990 (diff)
downloadmarcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar.gz
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar.bz2
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar.lz
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar.xz
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.tar.zst
marcuscom-ports-51b484f9b07e185f12ae1e5664c01612858d41df.zip
Update to 2.29.4.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13293 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/anjuta/files')
-rw-r--r--devel/anjuta/files/patch-Makefile.in31
-rw-r--r--devel/anjuta/files/patch-doc::Makefile.in11
-rw-r--r--devel/anjuta/files/patch-libanjuta_anjuta-launcher.c76
-rw-r--r--devel/anjuta/files/patch-plugins_gdb_debugger.c11
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_plugin.c11
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c71
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h11
7 files changed, 222 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..b0d1cdbdc
--- /dev/null
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -0,0 +1,31 @@
+--- Makefile.in.orig 2009-12-23 12:28:03.000000000 +0100
++++ Makefile.in 2009-12-23 12:31:34.000000000 +0100
+@@ -490,17 +490,17 @@ uninstall-anjuta_dataDATA:
+ echo " ( cd '$(DESTDIR)$(anjuta_datadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(anjuta_datadir)" && rm -f $$files
+ install-anjutadocDATA: $(anjutadoc_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)"
+- @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjutadocdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(anjutadocdir)" || exit $$?; \
+- done
++# @$(NORMAL_INSTALL)
++# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)"
++# @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
++# for p in $$list; do \
++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++# echo "$$d$$p"; \
++# done | $(am__base_list) | \
++# while read files; do \
++# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjutadocdir)'"; \
++# $(INSTALL_DATA) $$files "$(DESTDIR)$(anjutadocdir)" || exit $$?; \
++# 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_gdb_debugger.c b/devel/anjuta/files/patch-plugins_gdb_debugger.c
new file mode 100644
index 000000000..3667278cc
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_gdb_debugger.c
@@ -0,0 +1,11 @@
+--- plugins/gdb/debugger.c.orig 2009-12-19 15:21:02.000000000 -0500
++++ plugins/gdb/debugger.c 2009-12-19 15:21:13.000000000 -0500
+@@ -54,7 +54,7 @@
+
+ #define GDB_PROMPT "(gdb)"
+ #define FILE_BUFFER_SIZE 1024
+-#define GDB_PATH "gdb"
++#define GDB_PATH "gdb66"
+ #define SUMMARY_MAX_LENGTH 90 /* Should be smaller than 4K to be displayed
+ * in GtkCellRendererCell */
+
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_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
new file mode 100644
index 000000000..b50d375a1
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
@@ -0,0 +1,71 @@
+--- 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);
+- } while (remaining_chars + len_marker < len_chars || marker_ptr != NULL);
++ } while (remaining_chars > 0 || marker_ptr != NULL);
+ }
+ else
+ {
+@@ -1831,8 +1831,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
+ gint i = 0;
+ while (TRUE)
+ {
+- 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)
+@@ -1852,12 +1852,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);*/
+
+@@ -2446,7 +2446,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
+@@ -2535,7 +2535,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;
+ }
+@@ -6059,12 +6059,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-prefs.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
new file mode 100644
index 000000000..fe850697c
--- /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-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/ctags:0:symboldb.ctags"
+ #define CTAGS_PREFS_KEY "symboldb.ctags"
+ */
+ #define PROJECT_AUTOSCAN "symboldb.scan_prj_pkgs"