r25548 - in /desktop/unstable/anjuta/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Nov 13 10:35:57 UTC 2010
Author: joss
Date: Sat Nov 13 10:35:57 2010
New Revision: 25548
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25548
Log:
* Pick some patches in the upstream git repository.
+ 02_python_autoindent_hang.patch: fix lockup in the python
auto-indentation code.
+ 03_brace_completion_crash.patch: fix crasher in the C++/Java smart
brace completion code.
+ 04_launcher_crash.patch: replace possible crasher in the launcher
code by a critical warning.
+ 05_autocompletion_duplicates.patch: don’t show duplicate results
in C++/Java autocompletion.
+ 06_autocompletion_brace.patch: in C++/Java, don’t add opening
brace when autocompleting if it is already here.
+ 07_filewizard_csharp.patch: don’t require headers for C#.
Added:
desktop/unstable/anjuta/debian/patches/02_python_autoindent_hang.patch
desktop/unstable/anjuta/debian/patches/03_brace_completion_crash.patch
desktop/unstable/anjuta/debian/patches/04_launcher_crash.patch
desktop/unstable/anjuta/debian/patches/05_autocompletion_duplicates.patch
desktop/unstable/anjuta/debian/patches/06_autocompletion_brace.patch
desktop/unstable/anjuta/debian/patches/07_filewizard_csharp.patch
Modified:
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/patches/series
Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=25548&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,3 +1,20 @@
+anjuta (2:2.32.0.0-4) unstable; urgency=low
+
+ * Pick some patches in the upstream git repository.
+ + 02_python_autoindent_hang.patch: fix lockup in the python
+ auto-indentation code.
+ + 03_brace_completion_crash.patch: fix crasher in the C++/Java smart
+ brace completion code.
+ + 04_launcher_crash.patch: replace possible crasher in the launcher
+ code by a critical warning.
+ + 05_autocompletion_duplicates.patch: don’t show duplicate results
+ in C++/Java autocompletion.
+ + 06_autocompletion_brace.patch: in C++/Java, don’t add opening
+ brace when autocompleting if it is already here.
+ + 07_filewizard_csharp.patch: don’t require headers for C#.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 13 Nov 2010 11:36:14 +0100
+
anjuta (2:2.32.0.0-3) unstable; urgency=low
* 01_python_plugin_ldflags.patch: new patch. Fix Python plugin by
Added: desktop/unstable/anjuta/debian/patches/02_python_autoindent_hang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/02_python_autoindent_hang.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/02_python_autoindent_hang.patch (added)
+++ desktop/unstable/anjuta/debian/patches/02_python_autoindent_hang.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,22 @@
+From 96960aa1fd5ee53e04e13ee9d544f836eabb15fe Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Sun, 03 Oct 2010 12:42:47 +0000
+Subject: python-support: Fix bgo#631223 autointention causes anjuta to hang
+
+It was caused by calling ianjuta_editor_line_end_position with negative line values.
+---
+diff --git a/plugins/language-support-python/plugin.c b/plugins/language-support-python/plugin.c
+index d839c2d..1ab10a5 100644
+--- a/plugins/language-support-python/plugin.c
++++ b/plugins/language-support-python/plugin.c
+@@ -743,7 +743,7 @@ get_line_indentation_base (PythonPlugin *plugin,
+ else
+ {
+ gint line = currentline;
+- while (is_spaces_only(editor, line))
++ while (is_spaces_only(editor, line) && line >= 0)
+ line--;
+ line_indent = get_line_indentation (editor, line);
+ }
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/03_brace_completion_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/03_brace_completion_crash.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/03_brace_completion_crash.patch (added)
+++ desktop/unstable/anjuta/debian/patches/03_brace_completion_crash.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,61 @@
+From 16821343b7d665b1eb9b3f862e2efb1e67838e4f Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Wed, 10 Nov 2010 10:26:33 +0000
+Subject: language-support-cpp-java: bgo#633112 - Smart Brace Completion Quotation Mark Crash
+
+---
+diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
+index fd6ca66..e6fde1c 100644
+--- a/plugins/language-support-cpp-java/plugin.c
++++ b/plugins/language-support-cpp-java/plugin.c
+@@ -1406,6 +1406,22 @@ get_line_auto_indentation (CppJavaPlugin *plugin, IAnjutaEditor *editor,
+ return line_indent;
+ }
+
++static void on_editor_char_inserted_cpp (IAnjutaEditor *editor,
++ IAnjutaIterable *insert_pos,
++ gchar ch,
++ CppJavaPlugin *plugin);
++
++static void
++insert_editor_blocked (IAnjutaEditor* editor,
++ IAnjutaIterable* iter,
++ gchar* text,
++ CppJavaPlugin* plugin)
++{
++ g_signal_handlers_block_by_func (editor, on_editor_char_inserted_cpp, plugin);
++ ianjuta_editor_insert (editor, iter, text, -1, NULL);
++ g_signal_handlers_unblock_by_func (editor, on_editor_char_inserted_cpp, plugin);
++}
++
+ static void
+ on_editor_char_inserted_cpp (IAnjutaEditor *editor,
+ IAnjutaIterable *insert_pos,
+@@ -1503,12 +1519,12 @@ on_editor_char_inserted_cpp (IAnjutaEditor *editor,
+ switch (ch)
+ {
+ case '[':
+- ianjuta_editor_insert (editor, iter,
+- "]", 1, NULL);
++ insert_editor_blocked (editor, iter,
++ "]", plugin);
+ break;
+ case '(':
+- ianjuta_editor_insert (editor, iter,
+- ")", 1, NULL);
++ insert_editor_blocked (editor, iter,
++ ")", plugin);
+ break;
+ default:
+ break;
+@@ -1548,7 +1564,7 @@ on_editor_char_inserted_cpp (IAnjutaEditor *editor,
+ else c = g_strdup ("'");
+
+ ianjuta_document_begin_undo_action (IANJUTA_DOCUMENT (editor), NULL);
+- ianjuta_editor_insert (editor, iter, c, 1, NULL);
++ insert_editor_blocked (editor, iter, c, plugin);
+ ianjuta_editor_goto_position (editor, iter, NULL);
+ ianjuta_document_end_undo_action (IANJUTA_DOCUMENT (editor), NULL);
+
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/04_launcher_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/04_launcher_crash.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/04_launcher_crash.patch (added)
+++ desktop/unstable/anjuta/debian/patches/04_launcher_crash.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,26 @@
+From a875ff9bd3c644df9579b7071e62babca8631cdf Mon Sep 17 00:00:00 2001
+From: Sébastien Granjoux <seb.sfo at free.fr>
+Date: Mon, 01 Nov 2010 18:23:42 +0000
+Subject: libanjuta: Replace a crash by a critical warning
+
+---
+diff --git a/libanjuta/anjuta-launcher.c b/libanjuta/anjuta-launcher.c
+index ff448f4..4496765 100644
+--- a/libanjuta/anjuta-launcher.c
++++ b/libanjuta/anjuta-launcher.c
+@@ -422,11 +422,12 @@ anjuta_launcher_send_stdin_eof (AnjutaLauncher *launcher)
+ void
+ anjuta_launcher_send_ptyin (AnjutaLauncher *launcher, const gchar * input_str)
+ {
+- gsize bytes_written;
++ gsize bytes_written = 0;
+ GError *err = NULL;
+
+ g_return_if_fail (launcher);
+ g_return_if_fail (input_str);
++ g_return_if_fail (launcher->priv->pty_channel != NULL);
+
+ if (strlen (input_str) == 0)
+ return;
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/05_autocompletion_duplicates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/05_autocompletion_duplicates.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/05_autocompletion_duplicates.patch (added)
+++ desktop/unstable/anjuta/debian/patches/05_autocompletion_duplicates.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,23 @@
+From e55da56ec8da458739d00eb4d286e43a47c790ec Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Mon, 25 Oct 2010 12:45:40 +0000
+Subject: language-support-cpp: Don't show duplicated results in autocompletion
+
+---
+diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
+index bf07d69..15f204b 100644
+--- a/plugins/language-support-cpp-java/cpp-java-assist.c
++++ b/plugins/language-support-cpp-java/cpp-java-assist.c
+@@ -619,8 +619,8 @@ on_symbol_search_complete (IAnjutaSymbolQuery *query, IAnjutaIterable* symbols,
+ g_completion_add_items (assist->priv->completion_cache, proposals);
+ gboolean running = assist->priv->async_system_id || assist->priv->async_file_id ||
+ assist->priv->async_project_id;
+-
+- cpp_java_assist_populate_real (assist, !running);
++ if (!running)
++ cpp_java_assist_populate_real (assist, TRUE);
+ g_list_free (proposals);
+ }
+
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/06_autocompletion_brace.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/06_autocompletion_brace.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/06_autocompletion_brace.patch (added)
+++ desktop/unstable/anjuta/debian/patches/06_autocompletion_brace.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,76 @@
+From 5d15c8e20b2c2e6f9cfc7144955c39e7e3010ba8 Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Fri, 22 Oct 2010 14:07:33 +0000
+Subject: language-support-cpp-java: bgo#621916 - check for brace
+
+Function autocompletion should check for already present " (" string
+---
+diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
+index 15f204b..8b5bded 100644
+--- a/plugins/language-support-cpp-java/cpp-java-assist.c
++++ b/plugins/language-support-cpp-java/cpp-java-assist.c
+@@ -1161,6 +1161,34 @@ cpp_java_assist_populate (IAnjutaProvider* self, IAnjutaIterable* cursor, GError
+ }
+
+ /**
++ * cpp_java_assist_find_next_brace:
++ * @self: CppJavaAssist object
++ * @iter: Iter to start searching at
++ *
++ * Returns: TRUE if the next non-whitespace character is a opening brace,
++ * FALSE otherwise
++ */
++static gboolean
++cpp_java_assist_find_next_brace (CppJavaAssist* assist,
++ IAnjutaIterable* iter)
++{
++ IAnjutaIterable* my_iter = ianjuta_iterable_clone (iter, NULL);
++ char ch;
++ do
++ {
++ ch = ianjuta_editor_cell_get_char (IANJUTA_EDITOR_CELL (my_iter), 0, NULL);
++ if (ch == '(')
++ {
++ g_object_unref (my_iter);
++ return TRUE;
++ }
++ }
++ while (g_ascii_isspace (ch) && ianjuta_iterable_next (my_iter, NULL));
++
++ return FALSE;
++}
++
++/**
+ * cpp_java_assist_activate:
+ * @self: IAnjutaProvider object
+ * @iter: cursor position when proposal was activated
+@@ -1193,11 +1221,13 @@ cpp_java_assist_activate (IAnjutaProvider* self, IAnjutaIterable* iter, gpointer
+ anjuta_preferences_get_bool_with_default (assist->priv->preferences,
+ PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC,
+ TRUE);
+- if (add_space_after_func)
+- g_string_append (assistance, " ");
+-
+- if (add_brace_after_func)
+- g_string_append (assistance, "(");
++ if (!cpp_java_assist_find_next_brace (assist, iter))
++ {
++ if (add_space_after_func)
++ g_string_append (assistance, " ");
++ if (add_brace_after_func)
++ g_string_append (assistance, "(");
++ }
+ }
+
+ te = IANJUTA_EDITOR (assist->priv->iassist);
+@@ -1227,7 +1257,7 @@ cpp_java_assist_activate (IAnjutaProvider* self, IAnjutaIterable* iter, gpointer
+ TRUE))
+ assist->priv->calltip_active = cpp_java_assist_calltip (assist);
+
+- }
++ }
+ g_string_free (assistance, TRUE);
+ }
+
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/07_filewizard_csharp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/07_filewizard_csharp.patch?rev=25548&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/07_filewizard_csharp.patch (added)
+++ desktop/unstable/anjuta/debian/patches/07_filewizard_csharp.patch [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,0 +1,22 @@
+From 7ddeb1249c061ef5895f0c847dd553d904e3b1a6 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail at jensge.org>
+Date: Sat, 16 Oct 2010 21:22:39 +0000
+Subject: file-wizard: Treat C# like Java
+
+No need for header files and header template
+---
+diff --git a/plugins/file-wizard/file.c b/plugins/file-wizard/file.c
+index bc4f00f..f7a141d 100644
+--- a/plugins/file-wizard/file.c
++++ b/plugins/file-wizard/file.c
+@@ -84,7 +84,7 @@ NewfileType new_file_type[] = {
+ {N_("C Source File"), ".c", LGE_HC, TRUE, TRUE, CMT_C, LGE_C},
+ {N_("C/C++ Header File"), ".h", -1, TRUE, TRUE, CMT_C, LGE_HC},
+ {N_("C++ Source File"), ".cxx", LGE_HC, TRUE, TRUE, CMT_CPP, LGE_CPLUS},
+- {N_("C# Source File"), ".c#", LGE_HC, FALSE, TRUE, CMT_CPP, LGE_CSHARP},
++ {N_("C# Source File"), ".c#", -1, FALSE, FALSE, CMT_CPP, LGE_CSHARP},
+ {N_("Java Source File"), ".java", -1, FALSE, FALSE, CMT_CPP, LGE_JAVA},
+ {N_("Perl Source File"), ".pl", -1, TRUE, TRUE, CMT_P, LGE_PERL},
+ {N_("Python Source File"), ".py", -1, TRUE, FALSE, CMT_P, LGE_PYTHON},
+--
+cgit v0.8.3.1
Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=25548&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Sat Nov 13 10:35:57 2010
@@ -1,4 +1,10 @@
01_python_plugin_ldflags.patch
+02_python_autoindent_hang.patch
+03_brace_completion_crash.patch
+04_launcher_crash.patch
+05_autocompletion_duplicates.patch
+06_autocompletion_brace.patch
+07_filewizard_csharp.patch
21_glib_2.24.patch
22_no_gdbus.patch
23_libgda_4.0.patch
More information about the pkg-gnome-commits
mailing list