diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-04 06:53:38 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-04 06:53:38 +0800 |
| commit | ee1bf393a768079d149126c870aa6c2e9fbd404f (patch) | |
| tree | 25d71bd838910c2e9d4545b27b742275d734ee95 /devel/anjuta | |
| parent | 16ad3ccd522cdb03c61d96378ca4d9fd8e7bad21 (diff) | |
| download | marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar.gz marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar.bz2 marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar.lz marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar.xz marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.tar.zst marcuscom-ports-ee1bf393a768079d149126c870aa6c2e9fbd404f.zip | |
Sync with FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9516 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/anjuta')
| -rw-r--r-- | devel/anjuta/Makefile | 4 | ||||
| -rw-r--r-- | devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c | 34 |
2 files changed, 22 insertions, 16 deletions
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index ec66a682b..acd0692c3 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,12 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.10 2007/08/12 04:39:21 marcus Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.11 2007/08/12 17:41:41 marcus Exp $ # PORTNAME= anjuta PORTVERSION= 2.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta diff --git a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c index ab81e8f05..986d68057 100644 --- a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c +++ b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c @@ -1,6 +1,6 @@ ---- 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 +--- plugins/document-manager/anjuta-docman.c.orig Thu Jun 7 14:56:53 2007 ++++ plugins/document-manager/anjuta-docman.c Fri Aug 31 16:53:19 2007 +@@ -902,6 +902,7 @@ const gchar *linenum; glong lineno; gboolean is_local_uri; @@ -8,19 +8,22 @@ gchar *normalized_path = NULL; IAnjutaEditor *te; -@@ -926,9 +927,9 @@ anjuta_docman_goto_file_line_mark (Anjut +@@ -926,9 +927,11 @@ /* 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) +- if (normalized_path == NULL) - normalized_path = g_strdup (uri); -+ (void) strlcpy (normalized_path, uri, PATH_MAX); ++ normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), normalized_path_buf); ++ if (normalized_path == NULL) { ++ (void) strlcpy (normalized_path_buf, uri, PATH_MAX); ++ normalized_path = normalized_path_buf; ++ } gnome_vfs_uri_unref (vfs_uri); /* g_free(filename); */ -@@ -942,6 +943,7 @@ anjuta_docman_goto_file_line_mark (Anjut +@@ -942,6 +945,7 @@ AnjutaDocmanPage *page; gboolean te_is_local_uri; gchar *te_uri; @@ -28,19 +31,22 @@ gchar *te_normalized_path = NULL; page = (AnjutaDocmanPage *) node->data; -@@ -959,9 +961,9 @@ anjuta_docman_goto_file_line_mark (Anjut +@@ -959,9 +963,11 @@ 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) +- if (te_normalized_path == NULL) - te_normalized_path = g_strdup (te_uri); -+ (void) strlcpy (te_normalized_path, te_uri, PATH_MAX); ++ te_normalized_path_buf); ++ if (te_normalized_path == NULL) { ++ (void) strlcpy (te_normalized_path_buf, te_uri, PATH_MAX); ++ te_normalized_path = te_normalized_path_buf; ++ } 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 +@@ -982,12 +988,9 @@ an_file_history_push (te_uri, lineno); g_free (uri); g_free (te_uri); @@ -53,7 +59,7 @@ node = g_list_next (node); } te = anjuta_docman_add_editor (docman, uri, NULL); -@@ -1006,7 +1005,6 @@ anjuta_docman_goto_file_line_mark (Anjut +@@ -1006,7 +1009,6 @@ } } g_free (uri); |