Mailinglist Archive: opensuse-commit (762 mails)
| < Previous | Next > |
commit anjuta-extras for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 10 Aug 2010 02:46:11 +0200
- Message-id: <20100810004611.D8683201FA@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package anjuta-extras for openSUSE:Factory
checked in at Tue Aug 10 02:46:11 CEST 2010.
--------
--- GNOME/anjuta-extras/anjuta-extras.changes 2010-06-04 17:29:58.000000000
+0200
+++ anjuta-extras/anjuta-extras.changes 2010-08-06 22:43:27.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Aug 6 18:21:55 CEST 2010 - vuntz@xxxxxxxxxxxx
+
+- Update to version 2.31.1.0:
+ + scintilla: Apparently sourceview doesn't change the iterator
+ when inserting text now
+ + class-inheritance: Removed plugin as it got moved to anjuta
+- Add anjuta-extras-fixes-from-git.patch to fix build with latest
+ anjuta.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
anjuta-extras-2.30.1.0.tar.bz2
New:
----
anjuta-extras-2.31.1.0.tar.bz2
anjuta-extras-fixes-from-git.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ anjuta-extras.spec ++++++
--- /var/tmp/diff_new_pack.MNqFhG/_old 2010-08-10 02:44:12.000000000 +0200
+++ /var/tmp/diff_new_pack.MNqFhG/_new 2010-08-10 02:44:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package anjuta-extras (Version 2.30.1.0)
+# spec file for package anjuta-extras (Version 2.31.1.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Dominique Leuenberger, Almere, The Netherlands.
@@ -20,12 +20,14 @@
Name: anjuta-extras
Summary: Extra plugins for anjuta
-Version: 2.30.1.0
-Release: 3
+Version: 2.31.1.0
+Release: 1
License: GPLv2+
Group: Development/Tools/IDE
Url: http://download.gnome.org/sources/anjuta-extras
Source: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM anjuta-extras-fixes-from-git.patch vuntz@xxxxxxxxxxxx --
Taken from git, to fix build with latest anjuta
+Patch0: anjuta-extras-fixes-from-git.patch
BuildRequires: anjuta-devel
BuildRequires: binutils-devel
BuildRequires: gcc-c++
@@ -53,6 +55,7 @@
%prep
%setup -q
translation-update-upstream
+%patch0 -p1
%build
%configure --disable-static \
++++++ anjuta-extras-2.30.1.0.tar.bz2 -> anjuta-extras-2.31.1.0.tar.bz2 ++++++
++++ 4091 lines of diff (skipped)
++++++ anjuta-extras-fixes-from-git.patch ++++++
From b83c333f8066da7f502a51d8a742bcfbcffd2fd0 Mon Sep 17 00:00:00 2001From: Massimo Corà <mcora@xxxxxxxxxxxxx>
Date: Sat, 19 Jun 2010 14:13:28 +0000
Subject: scintilla: porting to new symbol-db query interface.
---
diff --git a/plugins/scintilla/plugin.c b/plugins/scintilla/plugin.c
index 2ed134a..fa8a181 100644
--- a/plugins/scintilla/plugin.c
+++ b/plugins/scintilla/plugin.c
@@ -41,6 +41,11 @@
gpointer parent_class;
+static IAnjutaSymbolQuery *query_project = NULL;
+static IAnjutaSymbolQuery *query_system = NULL;
+static IAnjutaSymbolManager *manager = NULL;
+
+
/* Keep an up to date list of type name
*---------------------------------------------------------------------------*/
@@ -58,7 +63,7 @@ update_type_list (AnjutaShell *shell, IAnjutaIterable *iter,
const gchar *name)
GString *s =
g_string_sized_new(ianjuta_iterable_get_length (iter, NULL) * 10);
do {
IAnjutaSymbol *symbol = IANJUTA_SYMBOL (iter);
- const gchar *sname = ianjuta_symbol_get_name
(symbol, NULL);
+ const gchar *sname = ianjuta_symbol_get_string
(symbol, IANJUTA_SYMBOL_FIELD_NAME, NULL);
g_string_append(s, sname);
g_string_append_c(s, ' ');
} while (ianjuta_iterable_next (iter, NULL));
@@ -99,53 +104,27 @@ update_type_list (AnjutaShell *shell, IAnjutaIterable
*iter, const gchar *name)
}
static void
-project_symbol_found (guint search_id, IAnjutaIterable *iter, gpointer
user_data)
+project_symbol_found (IAnjutaSymbolQuery *query, IAnjutaIterable* symbols,
gpointer user_data)
{
- update_type_list (ANJUTA_SHELL (user_data), iter,
TEXT_EDITOR_PROJECT_TYPE_LIST);
+ update_type_list (ANJUTA_SHELL (user_data), symbols,
TEXT_EDITOR_PROJECT_TYPE_LIST);
}
static void
-system_symbol_found (guint search_id, IAnjutaIterable *iter, gpointer
user_data)
+system_symbol_found (IAnjutaSymbolQuery *query, IAnjutaIterable* symbols,
gpointer user_data)
{
- update_type_list (ANJUTA_SHELL (user_data), iter,
TEXT_EDITOR_SYSTEM_TYPE_LIST);
+ update_type_list (ANJUTA_SHELL (user_data), symbols,
TEXT_EDITOR_SYSTEM_TYPE_LIST);
}
static void
on_project_symbol_scanned (IAnjutaSymbolManager *manager, guint process,
AnjutaShell *shell)
{
- /* Re-scan project symbols */
- ianjuta_symbol_manager_search_project_async (manager,
- IANJUTA_SYMBOL_TYPE_TYPEDEF,
- TRUE,
- IANJUTA_SYMBOL_FIELD_SIMPLE,
- "%",
- IANJUTA_SYMBOL_MANAGER_SEARCH_FS_IGNORE,
- -1,
- -1,
- NULL,
- NULL,
- project_symbol_found,
- shell,
- NULL);
+ ianjuta_symbol_query_search_all (query_project, NULL);
}
static void
on_system_symbol_scanned (IAnjutaSymbolManager *manager, guint process,
AnjutaShell *shell)
{
- /* Re-scan system symbols */
- ianjuta_symbol_manager_search_system_async (manager,
- IANJUTA_SYMBOL_TYPE_TYPEDEF,
- TRUE,
- IANJUTA_SYMBOL_FIELD_SIMPLE,
- "%",
- IANJUTA_SYMBOL_MANAGER_SEARCH_FS_IGNORE,
- -1,
- -1,
- NULL,
- NULL,
- system_symbol_found,
- shell,
- NULL);
+ ianjuta_symbol_query_search_all (query_system, NULL);
}
static void
@@ -158,16 +137,64 @@ on_style_button_clicked(GtkWidget* button,
AnjutaPreferences* prefs)
static gboolean
activate_plugin (AnjutaPlugin *plugin)
{
- IAnjutaSymbolManager *manager = anjuta_shell_get_interface
(plugin->shell, IAnjutaSymbolManager, NULL);
+ static IAnjutaSymbolField query_fields[] = {
+ IANJUTA_SYMBOL_FIELD_ID,
+ IANJUTA_SYMBOL_FIELD_NAME,
+ IANJUTA_SYMBOL_FIELD_KIND,
+ IANJUTA_SYMBOL_FIELD_TYPE
+ };
+
+ manager = anjuta_shell_get_interface (plugin->shell,
+ IAnjutaSymbolManager, NULL);
+
+ /* query project */
+ query_project =
+ ianjuta_symbol_manager_create_query (manager,
+
IANJUTA_SYMBOL_QUERY_SEARCH_ALL,
+
IANJUTA_SYMBOL_QUERY_DB_PROJECT,
+ NULL);
+
+ ianjuta_symbol_query_set_fields (query_project,
+ G_N_ELEMENTS (query_fields),
+ query_fields, NULL);
+ ianjuta_symbol_query_set_file_scope (query_project,
+
IANJUTA_SYMBOL_QUERY_SEARCH_FS_IGNORE, NULL);
+ ianjuta_symbol_query_set_mode (query_project,
+ IANJUTA_SYMBOL_QUERY_MODE_ASYNC, NULL);
+ ianjuta_symbol_query_set_filters (query_project,
IANJUTA_SYMBOL_TYPE_TYPEDEF,
+ TRUE, NULL);
+ g_signal_connect (query_project, "async-result",
+ G_CALLBACK (project_symbol_found), plugin->shell);
+
+ /* query system */
+ query_system =
+ ianjuta_symbol_manager_create_query (manager,
+
IANJUTA_SYMBOL_QUERY_SEARCH_ALL,
+
IANJUTA_SYMBOL_QUERY_DB_SYSTEM,
+ NULL);
+
+ ianjuta_symbol_query_set_fields (query_system,
+ G_N_ELEMENTS (query_fields),
+ query_fields, NULL);
+ ianjuta_symbol_query_set_file_scope (query_system,
+
IANJUTA_SYMBOL_QUERY_SEARCH_FS_IGNORE, NULL);
+ ianjuta_symbol_query_set_mode (query_system,
+ IANJUTA_SYMBOL_QUERY_MODE_ASYNC, NULL);
+ ianjuta_symbol_query_set_filters (query_system,
IANJUTA_SYMBOL_TYPE_TYPEDEF,
+ TRUE, NULL);
+
+ g_signal_connect (query_system, "async-result",
+ G_CALLBACK (system_symbol_found), plugin->shell);
- /* Get notified when scan end, to update type list */
- g_signal_connect (G_OBJECT (manager), "prj_scan_end", G_CALLBACK
(on_project_symbol_scanned), plugin->shell);
- g_signal_connect (G_OBJECT (manager), "sys_scan_end", G_CALLBACK
(on_system_symbol_scanned), plugin->shell);
- /* Initialize type list */
- on_project_symbol_scanned (manager, 0, plugin->shell);
- on_system_symbol_scanned (manager, 0, plugin->shell);
+ /* Get notified when scan end, to update type list */
+ g_signal_connect (G_OBJECT (manager), "prj_scan_end", G_CALLBACK
(on_project_symbol_scanned), NULL);
+ g_signal_connect (G_OBJECT (manager), "sys_scan_end", G_CALLBACK
(on_system_symbol_scanned), NULL);
+ /* Initialize type list */
+ on_project_symbol_scanned (manager, 0, NULL);
+ on_system_symbol_scanned (manager, 0, NULL);
+
return TRUE;
}
@@ -179,6 +206,15 @@ deactivate_plugin (AnjutaPlugin *plugin)
/* Disconnect signals */
g_signal_handlers_disconnect_by_func (G_OBJECT (manager), G_CALLBACK
(on_project_symbol_scanned), plugin->shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (manager), G_CALLBACK
(on_system_symbol_scanned), plugin->shell);
+
+ if (query_project)
+ g_object_unref (query_project);
+
+ if (query_system)
+ g_object_unref (query_system);
+
+ if (manager)
+ g_object_unref (manager);
return TRUE;
}
--
cgit v0.8.3.1
From 5b2015c87f771b049e4ce15469228030a949809d Mon Sep 17 00:00:00 2001From: Massimo Corà <mcora@xxxxxxxxxxxxx>
Date: Tue, 22 Jun 2010 21:26:03 +0000
Subject: profiler: porting to new symbol-db query iterface.
---
diff --git a/plugins/profiler/gprof-view.c b/plugins/profiler/gprof-view.c
index 21ad73a..a15b894 100644
--- a/plugins/profiler/gprof-view.c
+++ b/plugins/profiler/gprof-view.c
@@ -118,29 +118,47 @@ gprof_view_show_symbol_in_editor (GProfView *self,
IAnjutaIterable *symbol_iter;
IAnjutaSymbol *symbol;
guint line;
+ IAnjutaSymbolQuery *query;
+ static IAnjutaSymbolField query_fields[] = {
+ IANJUTA_SYMBOL_FIELD_ID,
+ IANJUTA_SYMBOL_FIELD_NAME,
+ IANJUTA_SYMBOL_FIELD_TYPE
+ };
+
if (self->priv->symbol_manager &&
self->priv->document_manager)
{
- symbol_iter = ianjuta_symbol_manager_search
(self->priv->symbol_manager,
-
IANJUTA_SYMBOL_TYPE_FUNCTION,
-
TRUE,
-
IANJUTA_SYMBOL_FIELD_SIMPLE,
-
symbol_name,
-
FALSE,
-
IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PUBLIC,
-
FALSE,
-
-1,
-
-1,
-
NULL);
+ /* create one everytime. This method doesn't need particular
performances */
+ query = ianjuta_symbol_manager_create_query
(self->priv->symbol_manager,
+
IANJUTA_SYMBOL_QUERY_SEARCH,
+
IANJUTA_SYMBOL_QUERY_DB_PROJECT,
+
NULL);
+
+ ianjuta_symbol_query_set_fields (query,
+ G_N_ELEMENTS (query_fields),
+ query_fields, NULL);
+ ianjuta_symbol_query_set_file_scope (query,
+
IANJUTA_SYMBOL_QUERY_SEARCH_FS_PUBLIC, NULL);
+
+ ianjuta_symbol_query_set_mode (query,
+ IANJUTA_SYMBOL_QUERY_MODE_SYNC, NULL);
+
+ ianjuta_symbol_query_set_filters (query,
IANJUTA_SYMBOL_TYPE_FUNCTION,
+ TRUE, NULL);
+
+
+ /* do the search */
+ symbol_iter = ianjuta_symbol_query_search (query, symbol_name,
NULL);
+
if (symbol_iter &&
ianjuta_iterable_get_length (symbol_iter, NULL) > 0)
{
GFile* file;
symbol = IANJUTA_SYMBOL (symbol_iter);
file = ianjuta_symbol_get_file (symbol, NULL);
- line = ianjuta_symbol_get_line (symbol, NULL);
+ line = ianjuta_symbol_get_int (symbol,
IANJUTA_SYMBOL_FIELD_FILE_POS, NULL);
ianjuta_document_manager_goto_file_line
(self->priv->document_manager,
file, line, NULL);
@@ -148,6 +166,8 @@ gprof_view_show_symbol_in_editor (GProfView *self,
g_object_unref (symbol_iter);
g_object_unref (file);
}
+
+ g_object_unref (query);
}
}
--
cgit v0.8.3.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |