diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
commit | 926382e09698007dc3472481164045c6b0b9754a (patch) | |
tree | d0ae60e8f02a2f6b230176c1f2dd549262359efb /devel/anjuta/files | |
parent | 42048341091e3810049dedfc96d4b312013ab048 (diff) | |
download | marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.gz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.bz2 marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.lz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.xz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.zst marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.zip |
Post 2.30.1 commit clean up.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14135 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/anjuta/files')
-rw-r--r-- | devel/anjuta/files/patch-Makefile.in | 31 | ||||
-rw-r--r-- | devel/anjuta/files/patch-doc::Makefile.in | 11 | ||||
-rw-r--r-- | devel/anjuta/files/patch-libanjuta_anjuta-launcher.c | 76 | ||||
-rw-r--r-- | devel/anjuta/files/patch-plugins_gdb_debugger.c | 11 | ||||
-rw-r--r-- | devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c | 71 | ||||
-rw-r--r-- | devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h | 11 |
6 files changed, 0 insertions, 211 deletions
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in deleted file mode 100644 index b0d1cdbdc..000000000 --- a/devel/anjuta/files/patch-Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index a567fda33..000000000 --- a/devel/anjuta/files/patch-doc::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 126c7d9e3..000000000 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ /dev/null @@ -1,76 +0,0 @@ ---- 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 deleted file mode 100644 index 3667278cc..000000000 --- a/devel/anjuta/files/patch-plugins_gdb_debugger.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c deleted file mode 100644 index b50d375a1..000000000 --- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 deleted file mode 100644 index fe850697c..000000000 --- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" |