summaryrefslogtreecommitdiffstats
path: root/devel/anjuta/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/anjuta/files')
-rw-r--r--devel/anjuta/files/patch-Makefile.in25
-rw-r--r--devel/anjuta/files/patch-doc::Makefile.in25
-rw-r--r--devel/anjuta/files/patch-global-tags_create_global_tags.sh23
-rw-r--r--devel/anjuta/files/patch-libanjuta_anjuta-launcher.c80
-rw-r--r--devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c69
-rw-r--r--devel/anjuta/files/patch-plugins_glade_pluginc.c113
-rw-r--r--devel/anjuta/files/patch-scripts::anjuta_import.sh.in8
7 files changed, 0 insertions, 343 deletions
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
deleted file mode 100644
index 2aaa034b9..000000000
--- a/devel/anjuta/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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)"
-- @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
deleted file mode 100644
index 5f8d4d6ca..000000000
--- a/devel/anjuta/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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)"
-- @list='$(anjuta_doc_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \
-- $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \
-- done
-+# @$(NORMAL_INSTALL)
-+# 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) \
-+# echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \
-+# $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \
-+# done
-
- uninstall-anjuta_docDATA:
- @$(NORMAL_UNINSTALL)
diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh
deleted file mode 100644
index 206e390c2..000000000
--- a/devel/anjuta/files/patch-global-tags_create_global_tags.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 73987d782..000000000
--- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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 <signal.h>
-
- #if !defined(__sun) && !defined(__NetBSD__)
--# ifndef FREEBSD
-+# if !defined(__FreeBSD__)
- # include <pty.h>
- # else
- # include <libutil.h>
-@@ -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
deleted file mode 100644
index 986d68057..000000000
--- a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- 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;
-+ gchar normalized_path_buf[PATH_MAX];
- gchar *normalized_path = NULL;
-
- IAnjutaEditor *te;
-@@ -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);
-- if (normalized_path == NULL)
-- normalized_path = g_strdup (uri);
-+ 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 +945,7 @@
- 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 +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);
-- if (te_normalized_path == NULL)
-- te_normalized_path = g_strdup (te_uri);
-+ 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 +988,9 @@
- 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 +1009,6 @@
- }
- }
- g_free (uri);
-- g_free (normalized_path);
- return te ;
- }
-
diff --git a/devel/anjuta/files/patch-plugins_glade_pluginc.c b/devel/anjuta/files/patch-plugins_glade_pluginc.c
deleted file mode 100644
index 569bafe71..000000000
--- a/devel/anjuta/files/patch-plugins_glade_pluginc.c
+++ /dev/null
@@ -1,113 +0,0 @@
---- plugins/glade/plugin.c 2007/06/20 02:18:37 3013
-+++ plugins/glade/plugin.c 2007/07/07 13:25:08 3048
-@@ -20,7 +20,7 @@
-
- #include <config.h>
-
--#if (GLADEUI_VERSION <= 302)
-+#if (GLADEUI_VERSION <= 303)
- # include <glade.h>
- #else
- # if (GLADEUI_VERSION <= 314)
-@@ -54,7 +54,7 @@
- GtkActionGroup *action_group;
- GladeApp *gpw;
- GtkWidget *inspector;
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_notebook;
- #endif
- GtkWidget *view_box;
-@@ -428,7 +428,7 @@
- static void
- glade_do_close (GladePlugin *plugin, GladeProject *project)
- {
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_view;
-
- design_view = g_object_get_data (G_OBJECT (project), "design_view");
-@@ -459,7 +459,11 @@
- }
-
- #if (GLADEUI_VERSION >= 330)
-- if (glade_project_get_has_unsaved_changes (project))
-+# if (GLADEUI_VERSION > 331)
-+ if (glade_project_get_modified (project))
-+# else
-+ if (glade_project_get_has_unsaved_changes (project))
-+# endif
- #else
- if (project->changed)
- #endif
-@@ -502,14 +506,14 @@
- {
- GladeProject *project;
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_view;
- gint design_pagenum;
- #endif
- gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
- glade_app_set_project (project);
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- design_view = g_object_get_data (G_OBJECT (project), "design_view");
- design_pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->design_notebook),
- design_view);
-@@ -713,7 +717,7 @@
- gtk_container_remove (GTK_CONTAINER (parent), wid);
- }
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- static void
- glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project)
- {
-@@ -796,7 +800,7 @@
- g_object_unref (G_OBJECT (store));
- gtk_box_pack_start (GTK_BOX (priv->view_box), priv->projects_combo,
- FALSE, FALSE, 0);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- # if (GLADEUI_VERSION >= 330)
- priv->inspector = glade_inspector_new ();
-
-@@ -825,7 +829,7 @@
- gtk_notebook_popup_enable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook));
-
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- /* Create design_notebook */
- priv->design_notebook = gtk_notebook_new ();
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->design_notebook), FALSE);
-@@ -862,7 +866,7 @@
- g_object_ref (glade_app_get_palette ());
- g_object_ref (glade_app_get_editor ());
- g_object_ref (priv->view_box);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- g_object_ref (priv->design_notebook);
- #endif
- gtk_widget_show (GTK_WIDGET (glade_app_get_palette ()));
-@@ -884,7 +888,7 @@
- "AnjutaGladeEditor", _("Properties"),
- "glade-plugin-icon",
- ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
- GTK_WIDGET (priv->design_notebook),
- "AnjutaGladeDesigner", _("Designer"),
-@@ -935,7 +939,7 @@
- anjuta_shell_remove_widget (plugin->shell,
- GTK_WIDGET (priv->view_box),
- NULL);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- anjuta_shell_remove_widget (plugin->shell,
- GTK_WIDGET (priv->design_notebook),
- NULL);
diff --git a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in b/devel/anjuta/files/patch-scripts::anjuta_import.sh.in
deleted file mode 100644
index 94b1413d6..000000000
--- a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/anjuta_import.sh.in.orig Wed May 14 16:09:42 2003
-+++ scripts/anjuta_import.sh.in Wed May 14 16:11:15 2003
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Shell script to automatically create an Anjuta 1.x project file
- # Copyright: Biswapesh Chattopadhyay (biswapesh_chatterjee@tcscal.co.in) 2001-2002