From 6bb46cedc240ab0799cac6a9288c2418643c44c0 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 8 Jul 2007 08:21:31 +0000 Subject: Update to 2.2.0. See http://sourceforge.net/forum/forum.php?forum_id=709731 for all of the things changed in this release. This is a huge change from the previous stable 1.2.x version. NOTE: While I did test quite a few runtime features, anjuta still seems a bit buggy. For best results, stick with the scintilla editor. --- devel/anjuta/files/patch-Makefile.in | 12 +- devel/anjuta/files/patch-configure | 16 -- devel/anjuta/files/patch-data::Makefile.in | 15 -- devel/anjuta/files/patch-doc::Makefile.in | 10 +- .../files/patch-global-tags_create_global_tags.sh | 23 +++ .../anjuta/files/patch-libanjuta_anjuta-launcher.c | 80 ++++++++++ .../patch-plugins_document-manager_anjuta-docman.c | 63 ++++++++ devel/anjuta/files/patch-src::debugger.c | 28 ---- devel/anjuta/files/patch-src::launcher.c | 14 -- devel/anjuta/files/patch-src::source.c | 11 -- devel/anjuta/files/patch-src_anjuta-encodings.c | 40 ----- devel/anjuta/files/patch-src_breakpoints.c | 21 --- devel/anjuta/files/patch-src_commands.c | 10 -- devel/anjuta/files/patch-src_executer.c | 20 --- devel/anjuta/files/patch-src_getline.c | 173 --------------------- 15 files changed, 177 insertions(+), 359 deletions(-) delete mode 100644 devel/anjuta/files/patch-configure delete mode 100644 devel/anjuta/files/patch-data::Makefile.in create mode 100644 devel/anjuta/files/patch-global-tags_create_global_tags.sh create mode 100644 devel/anjuta/files/patch-libanjuta_anjuta-launcher.c create mode 100644 devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c delete mode 100644 devel/anjuta/files/patch-src::debugger.c delete mode 100644 devel/anjuta/files/patch-src::launcher.c delete mode 100644 devel/anjuta/files/patch-src::source.c delete mode 100644 devel/anjuta/files/patch-src_anjuta-encodings.c delete mode 100644 devel/anjuta/files/patch-src_breakpoints.c delete mode 100644 devel/anjuta/files/patch-src_commands.c delete mode 100644 devel/anjuta/files/patch-src_executer.c delete mode 100644 devel/anjuta/files/patch-src_getline.c (limited to 'devel/anjuta/files') diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in index 1b5fe700ae63..2aaa034b93a9 100644 --- a/devel/anjuta/files/patch-Makefile.in +++ b/devel/anjuta/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Aug 17 02:27:09 2005 -+++ Makefile.in Wed Aug 17 02:27:33 2005 -@@ -395,14 +395,14 @@ - rm -f "$(DESTDIR)$(anjuta_glade_filedir)/$$f"; \ +--- Makefile.in.orig Sat Jul 7 20:39:34 2007 ++++ Makefile.in Sat Jul 7 20:40:39 2007 +@@ -493,14 +493,14 @@ uninstall-anjuta_dataDATA: + rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \ done install-anjutadocDATA: $(anjutadoc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" +- 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) \ @@ -13,7 +13,7 @@ - $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" ++# 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) \ diff --git a/devel/anjuta/files/patch-configure b/devel/anjuta/files/patch-configure deleted file mode 100644 index 9356323c5758..000000000000 --- a/devel/anjuta/files/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.orig Tue Apr 13 13:24:27 2004 -+++ configure Tue Apr 13 13:25:03 2004 -@@ -23995,11 +23995,11 @@ - fi - - systemdatadir=share --packagedatadir=share/${PACKAGE} -+packagedatadir=share/gnome/${PACKAGE} - packagedocdir=share/doc/${PACKAGE} - packageplugindir=lib/${PACKAGE}/plugins/${VERSION} - --packagepixmapsdir=share/pixmaps/${PACKAGE} -+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE} - packagehelpdir=share/gnome/help/${PACKAGE} - packagemenudir=share/gnome/apps - packageplugindir=lib/${PACKAGE} diff --git a/devel/anjuta/files/patch-data::Makefile.in b/devel/anjuta/files/patch-data::Makefile.in deleted file mode 100644 index 956f6a81535a..000000000000 --- a/devel/anjuta/files/patch-data::Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- data/Makefile.in.orig Wed Aug 17 02:30:12 2005 -+++ data/Makefile.in Wed Aug 17 02:29:02 2005 -@@ -270,10 +270,10 @@ - welcome.txt\ - autogen.sh - --anjuta_mimedir = $(prefix)/share/mime-info -+anjuta_mimedir = $(prefix)/share/gnome/mime-info - anjuta_mime_DATA = anjuta.mime - anjuta_mimelnkdir = $(prefix)/share/mimelnk/application --anjuta_mimelnk_DATA = x-anjuta-project.desktop -+anjuta_mimelnk_DATA = - EXTRA_DIST = $(anjuta_data_DATA) $(anjuta_mime_DATA) $(anjuta_mimelnk_DATA) - all: all-recursive - diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in index 525553c21f84..5f8d4d6ca628 100644 --- a/devel/anjuta/files/patch-doc::Makefile.in +++ b/devel/anjuta/files/patch-doc::Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Wed Aug 17 02:31:26 2005 -+++ doc/Makefile.in Wed Aug 17 02:31:56 2005 -@@ -352,14 +352,14 @@ +--- doc/Makefile.in.orig Sat Jul 7 20:41:01 2007 ++++ doc/Makefile.in Sat Jul 7 20:41:29 2007 +@@ -433,14 +433,14 @@ uninstall-man1: rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done install-anjuta_docDATA: $(anjuta_doc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" +- test -z "$(anjuta_docdir)" || $(MKDIR_P) "$(DESTDIR)$(anjuta_docdir)" - @list='$(anjuta_doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -13,7 +13,7 @@ - $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" ++# test -z "$(anjuta_docdir)" || $(MKDIR_P) "$(DESTDIR)$(anjuta_docdir)" +# @list='$(anjuta_doc_DATA)'; for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# f=$(am__strip_dir) \ diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh new file mode 100644 index 000000000000..206e390c23bc --- /dev/null +++ b/devel/anjuta/files/patch-global-tags_create_global_tags.sh @@ -0,0 +1,23 @@ +--- global-tags/create_global_tags.sh.orig Sun Jul 8 03:39:26 2007 ++++ global-tags/create_global_tags.sh Sun Jul 8 03:41:12 2007 +@@ -68,9 +68,9 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C + ## the packages, which we don't like. We only want cflags relevent + ## to the packages alone. + ## +- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/` ++ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/libdata\/pkgconfig'/` + PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH" +- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib64\/pkgconfig'/` ++ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/` + PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH" + + PKG_CONFIG_PATH_PROPER=`echo $PKG_CONFIG_PATH | sed -e 's/\:/ /g'` +@@ -88,7 +88,7 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C + for pkg_path in $PKG_CONFIG_PATH_PROPER; do + for pkg_file in `find "$pkg_path" -name '*.pc' 2>/dev/null`; do + # echo "Scanning package: $pkg_file" +- PKG_CFLAGS=`grep -e '^\(\w\+=\|\s*Cflags:\)' "$pkg_file"|sed -e 's/Cflags:\s*"\?\(.*\)"\?\s*/echo "\1"/' -e 's/^\(\w\+\)=\("\([^"]*\)"\|\(.*\)\)/\1="\3\4"/'|sh` ++ PKG_CFLAGS=`grep -E -e '^([a-zA-Z0-9_]+=|[[:space:]]*Cflags:)' "$pkg_file"|sed -E -e 's/Cflags:[[:space:]]*"?(.*)"?[[:space:]]*/echo "\1"/' -e 's/^([a-zA-Z0-9_]+)=("([^"]*)"|(.*))/\1="\3\4"/'|sh` + # echo $PKG_CFLAGS + package=`basename "$pkg_file" '.pc'` + # if [ ! -e $BASEDIR/tags/$package.anjutatags.gz ] ; then 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 000000000000..73987d782cd5 --- /dev/null +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -0,0 +1,80 @@ +--- libanjuta/anjuta-launcher.c.orig Mon Jun 11 13:22:08 2007 ++++ libanjuta/anjuta-launcher.c Sun Jul 8 03:39:07 2007 +@@ -37,7 +37,7 @@ + #include + + #if !defined(__sun) && !defined(__NetBSD__) +-# ifndef FREEBSD ++# if !defined(__FreeBSD__) + # include + # else + # include +@@ -713,7 +713,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 && !err) /* There is output */ + { + gchar *utf8_chars; +@@ -733,6 +734,13 @@ 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); ++ ret = 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)); +@@ -762,7 +770,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 && !err) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -782,6 +791,13 @@ 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); ++ ret = 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)); +@@ -811,7 +827,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 && !err) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -833,6 +850,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch + else if (err && errno != EAGAIN && errno != EINTR) + { + g_warning (_("launcher.c: Error while reading child pty\n")); ++ ret = FALSE; ++ } ++ else if (status == G_IO_STATUS_EOF) ++ { + ret = FALSE; + } + /* Read next chars if buffer was too small diff --git a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c new file mode 100644 index 000000000000..ab81e8f058a3 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c @@ -0,0 +1,63 @@ +--- plugins/document-manager/anjuta-docman.c.orig Sun Jul 8 03:12:10 2007 ++++ plugins/document-manager/anjuta-docman.c Sun Jul 8 03:20:22 2007 +@@ -902,6 +902,7 @@ anjuta_docman_goto_file_line_mark (Anjut + const gchar *linenum; + glong lineno; + gboolean is_local_uri; ++ gchar normalized_path_buf[PATH_MAX]; + gchar *normalized_path = NULL; + + IAnjutaEditor *te; +@@ -926,9 +927,9 @@ anjuta_docman_goto_file_line_mark (Anjut + /* Get the normalized file path for comparision */ + is_local_uri = gnome_vfs_uri_is_local (vfs_uri); + if (is_local_uri) +- normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), NULL); ++ normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), normalized_path_buf); + if (normalized_path == NULL) +- normalized_path = g_strdup (uri); ++ (void) strlcpy (normalized_path, uri, PATH_MAX); + + gnome_vfs_uri_unref (vfs_uri); + /* g_free(filename); */ +@@ -942,6 +943,7 @@ anjuta_docman_goto_file_line_mark (Anjut + AnjutaDocmanPage *page; + gboolean te_is_local_uri; + gchar *te_uri; ++ char te_normalized_path_buf[PATH_MAX]; + gchar *te_normalized_path = NULL; + + page = (AnjutaDocmanPage *) node->data; +@@ -959,9 +961,9 @@ anjuta_docman_goto_file_line_mark (Anjut + te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri); + if (te_is_local_uri) + te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), +- NULL); ++ te_normalized_path_buf); + if (te_normalized_path == NULL) +- te_normalized_path = g_strdup (te_uri); ++ (void) strlcpy (te_normalized_path, te_uri, PATH_MAX); + gnome_vfs_uri_unref (vfs_uri); + + if (strcmp (normalized_path, te_normalized_path) == 0) +@@ -982,12 +984,9 @@ anjuta_docman_goto_file_line_mark (Anjut + an_file_history_push (te_uri, lineno); + g_free (uri); + g_free (te_uri); +- g_free (normalized_path); +- g_free (te_normalized_path); + return te; + } + g_free (te_uri); +- g_free (te_normalized_path); + node = g_list_next (node); + } + te = anjuta_docman_add_editor (docman, uri, NULL); +@@ -1006,7 +1005,6 @@ anjuta_docman_goto_file_line_mark (Anjut + } + } + g_free (uri); +- g_free (normalized_path); + return te ; + } + diff --git a/devel/anjuta/files/patch-src::debugger.c b/devel/anjuta/files/patch-src::debugger.c deleted file mode 100644 index 8daecf386497..000000000000 --- a/devel/anjuta/files/patch-src::debugger.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/debugger.c.orig Fri Jan 30 20:24:26 2004 -+++ src/debugger.c Fri Jan 30 20:29:07 2004 -@@ -2092,9 +2092,11 @@ - void debugger_query_evaluate_expr_tip (const gchar *expr, - void (*parser) (GList *outputs, gpointer data), gpointer data) - { -+ gchar *printcmd; -+ - query_set_verbose (FALSE); - query_set_print_staticmembers (FALSE); -- gchar *printcmd = g_strconcat ("print ", expr, NULL); -+ printcmd = g_strconcat ("print ", expr, NULL); - debugger_put_cmd_in_queqe (printcmd, DB_CMD_NONE, parser, data); - query_set_verbose (TRUE); - query_set_print_staticmembers (TRUE); -@@ -2104,9 +2106,11 @@ - void debugger_query_evaluate_expr (const gchar *expr, - void (*parser) (GList *outputs, gpointer data), gpointer data) - { -+ gchar *printcmd; -+ - query_set_print_pretty (TRUE); - query_set_verbose (FALSE); -- gchar *printcmd = g_strconcat ("print ", expr, NULL); -+ printcmd = g_strconcat ("print ", expr, NULL); - debugger_put_cmd_in_queqe (printcmd, DB_CMD_SE_MESG | DB_CMD_SE_DIALOG, - parser, data); - query_set_print_pretty (FALSE); diff --git a/devel/anjuta/files/patch-src::launcher.c b/devel/anjuta/files/patch-src::launcher.c deleted file mode 100644 index 5783dc99ee6f..000000000000 --- a/devel/anjuta/files/patch-src::launcher.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/launcher.c.orig Sun Apr 24 09:28:02 2005 -+++ src/launcher.c Wed Aug 17 02:33:34 2005 -@@ -1130,9 +1130,9 @@ anjuta_launcher_fork (AnjutaLauncher *la - /* Set no delays for the write pipes (non_buffered) so - that we get all the outputs immidiately */ - if ((md = fcntl (stdout_pipe[1], F_GETFL)) != -1) -- fcntl (stdout_pipe[1], F_SETFL, O_SYNC | md); -+ fcntl (stdout_pipe[1], F_SETFL, O_FSYNC | md); - if ((md = fcntl (stderr_pipe[1], F_GETFL)) != -1) -- fcntl (stderr_pipe[1], F_SETFL, O_SYNC | md); -+ fcntl (stderr_pipe[1], F_SETFL, O_FSYNC | md); - - execvp (args[0], args); - g_warning (_("Cannot execute command: \"%s\""), args[0]); diff --git a/devel/anjuta/files/patch-src::source.c b/devel/anjuta/files/patch-src::source.c deleted file mode 100644 index f59845ef0124..000000000000 --- a/devel/anjuta/files/patch-src::source.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/source.c.orig Thu Apr 8 00:15:35 2004 -+++ src/source.c Tue Apr 13 13:26:20 2004 -@@ -335,7 +335,7 @@ - { - fprintf (fp, - "dnl Set PACKAGE DIRs in config.h.\n" -- "packagepixmapsdir=share/pixmaps/${PACKAGE}\n" -+ "packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}\n" - "packagehelpdir=share/gnome/help/${PACKAGE}\n" - "packagemenudir=share/gnome/apps\n"); - } diff --git a/devel/anjuta/files/patch-src_anjuta-encodings.c b/devel/anjuta/files/patch-src_anjuta-encodings.c deleted file mode 100644 index e86b8c915634..000000000000 --- a/devel/anjuta/files/patch-src_anjuta-encodings.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/anjuta-encodings.c.orig 2005-12-15 18:50:55.000000000 +0100 -+++ src/anjuta-encodings.c 2005-12-15 18:51:38.000000000 +0100 -@@ -707,15 +707,15 @@ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (stock_treeview)); - g_return_if_fail (selection != NULL); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); -- g_signal_connect (G_OBJECT (selection), "changed", -- G_CALLBACK (on_stock_selection_changed), NULL); - - model = create_encodings_treeview_model (); - gtk_tree_view_set_model (GTK_TREE_VIEW (stock_treeview), model); -+ g_signal_connect (G_OBJECT (selection), "changed", -+ G_CALLBACK (on_stock_selection_changed), NULL); - g_object_unref (model); - - /* Add the encoding column for supported treeview*/ - cell = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Supported Encodings"), -@@ -726,17 +726,17 @@ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (supported_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (supported_treeview)); - g_return_if_fail (selection != NULL); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); -- g_signal_connect (G_OBJECT (selection), "changed", -- G_CALLBACK (on_supported_selection_changed), NULL); - - /* create list store */ - model = GTK_TREE_MODEL (gtk_list_store_new (SUPPORTED_ENCODING_NUM_COLS, - G_TYPE_STRING, G_TYPE_POINTER)); - gtk_tree_view_set_model (GTK_TREE_VIEW (supported_treeview), model); -+ g_signal_connect (G_OBJECT (selection), "changed", -+ G_CALLBACK (on_supported_selection_changed), NULL); - g_object_unref (model); - - anjuta_preferences_register_property_custom (pref, supported_treeview, - SUPPORTED_ENCODINGS, - "ISO-8859-15", diff --git a/devel/anjuta/files/patch-src_breakpoints.c b/devel/anjuta/files/patch-src_breakpoints.c deleted file mode 100644 index 9d497e86e32f..000000000000 --- a/devel/anjuta/files/patch-src_breakpoints.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/breakpoints.c.orig Wed Apr 14 00:36:58 2004 -+++ src/breakpoints.c Wed Apr 14 00:37:19 2004 -@@ -1409,8 +1409,9 @@ - ptr1 = strchr (ptr, '\n'); - if (ptr1) - { -- *ptr1++ = '\0'; - const gchar condition_prefix[] = "\tstop only if "; -+ const gchar ignore_prefix[] = "\tignore next "; -+ *ptr1++ = '\0'; - if (g_str_has_prefix (ptr1, condition_prefix)) - { - ptr1 += sizeof(condition_prefix) - 1; -@@ -1418,7 +1419,6 @@ - ptr1 = strchr (cond, '\n'); - if (ptr1) *ptr1++ = '\0'; - } -- const gchar ignore_prefix[] = "\tignore next "; - if (g_str_has_prefix (ptr1, ignore_prefix)) - { - ptr1 += sizeof(ignore_prefix) - 1; diff --git a/devel/anjuta/files/patch-src_commands.c b/devel/anjuta/files/patch-src_commands.c deleted file mode 100644 index 89e481307f55..000000000000 --- a/devel/anjuta/files/patch-src_commands.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/commands.c.orig Tue Aug 31 00:41:32 2004 -+++ src/commands.c Tue Aug 31 00:41:56 2004 -@@ -102,6 +102,7 @@ - /* Ditto */ - static gchar * - term_commands[] = { -+ "gnome-terminal -e '$(anjuta.current.command)'", - "gnome-terminal -e \"$(anjuta.current.command)\"", - "gnome-terminal -x sh -c \"$(anjuta.current.command)\"", - "gnome-terminal --command=\"sh -c \\\"$(anjuta.current.command); read x\\\"\"", diff --git a/devel/anjuta/files/patch-src_executer.c b/devel/anjuta/files/patch-src_executer.c deleted file mode 100644 index dd5907d7310b..000000000000 --- a/devel/anjuta/files/patch-src_executer.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/executer.c.orig Tue Aug 31 00:40:58 2004 -+++ src/executer.c Tue Aug 31 00:41:25 2004 -@@ -154,7 +154,7 @@ - if(e->terminal) - { - gchar* escaped_cmd; -- escaped_cmd = anjuta_util_escape_quotes(command); -+ escaped_cmd = command; - prop_set_with_key (e->props, "anjuta.current.command", escaped_cmd); - - #ifdef DEBUG -@@ -162,7 +162,7 @@ - #endif - - cmd = command_editor_get_command (app->command_editor, COMMAND_TERMINAL); -- g_free(escaped_cmd); -+ /*g_free(escaped_cmd);*/ - } - else - { diff --git a/devel/anjuta/files/patch-src_getline.c b/devel/anjuta/files/patch-src_getline.c deleted file mode 100644 index d72401d3e822..000000000000 --- a/devel/anjuta/files/patch-src_getline.c +++ /dev/null @@ -1,173 +0,0 @@ ---- src/getline.c.orig Sun Aug 21 02:07:44 2005 -+++ src/getline.c Sun Aug 21 02:23:37 2005 -@@ -1,70 +1,112 @@ --/* -- * getline.c Copyright (C) 2003 Alexander Nedotsukov -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * for more details. -- * You should have received a copy of the GNU General Public License along -- * with this program; if not, write to the Free Software Foundation, Inc., 59 -- * Temple Place, Suite 330, Boston, MA 02111-1307 USA -- */ -+#include "config.h" - --#include -- --// #ifdef FREEBSD - #ifndef HAVE_GETLINE - -+#undef _GNU_SOURCE -+ -+#include - #include --#include --#include --#include - --/* GNU libc getline() compatibility */ -+#ifdef HAVE_STRINGS_H -+# include -+#else -+# include -+#endif /* HAVE_STRINGS_H */ -+ -+#ifdef HAVE_STDLIB_H -+# include -+#endif /* HAVE_STDLIB_H */ -+ -+#ifdef HAVE_UNISTD_H -+# include -+#endif /* HAVE_UNISTD_H */ -+ -+#include -+#include - --int --getline(char** line, size_t* size, FILE* fp) -+/* Read up to (and including) a '\n' from STREAM into *LINEPTR -+ (and null-terminate it). *LINEPTR is a pointer returned from malloc (or -+ NULL), pointing to *N characters of space. It is realloc'd as -+ necessary. Returns the number of characters read (not including the -+ null terminator), or -1 on error or EOF. */ -+ -+size_t -+getline (lineptr, n, stream) -+ char **lineptr; -+ size_t *n; -+ FILE *stream; - { -- static const size_t line_grow_by = 80; /* in most texts line fits console */ -- int ch; -- size_t i; -- -- if (line == NULL || size == NULL || fp == NULL) { /* illegal call */ -- errno = EINVAL; -- return -1; -- } -- if (*line == NULL && *size) { /* logically incorrect */ -- errno = EINVAL; -- return -1; -- } -+ char *line, *p; -+ long size, copy; - -- i = 0; -- while (1) { -- ch = fgetc(fp); -- if (ch == EOF) -- break; -- /* ensure bufer still large enough for ch and trailing null */ -- if ((*size - i) <= 1) { -- *line = (char*)realloc(*line, *size += line_grow_by); -- if (*line == NULL) { -- errno = ENOMEM; -- return -1; -- } -- } -- *(*line + i++) = (char)ch; -- if (ch == '\n') -- break; -+ if (lineptr == NULL || n == NULL) -+ { -+ errno = EINVAL; -+ return (size_t) -1; -+ } -+ -+ if (ferror (stream)) -+ return (size_t) -1; -+ -+ /* Make sure we have a line buffer to start with. */ -+ if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ -+ { -+#ifndef MAX_CANON -+#define MAX_CANON 256 -+#endif -+ if (!*lineptr) -+ line = (char *) malloc (MAX_CANON); -+ else -+ line = (char *) realloc (*lineptr, MAX_CANON); -+ if (line == NULL) -+ return (size_t) -1; -+ *lineptr = line; -+ *n = MAX_CANON; -+ } -+ -+ line = *lineptr; -+ size = *n; -+ -+ copy = size; -+ p = line; -+ -+ while (1) -+ { -+ long len; -+ -+ while (--copy > 0) -+ { -+ register int c = getc (stream); -+ if (c == EOF) -+ goto lose; -+ else if ((*p++ = c) == '\n') -+ goto win; - } -- -- *(*line + i) = 0; -- -- return ferror(fp) ? -1 : i; -+ -+ /* Need to enlarge the line buffer. */ -+ len = p - line; -+ size *= 2; -+ line = (char *) realloc (line, size); -+ if (line == NULL) -+ goto lose; -+ *lineptr = line; -+ *n = size; -+ p = line + len; -+ copy = size - len; -+ } -+ -+ lose: -+ if (p == *lineptr) -+ return (size_t) -1; -+ -+ /* Return a partial line since we got an error in the middle. */ -+ win: -+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) -+ if (p - 2 >= *lineptr && p[-2] == '\r') -+ p[-2] = p[-1], --p; -+#endif -+ *p = '\0'; -+ return p - *lineptr; - } - - #endif -- -- cgit v1.2.3