pool/anjuta
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

checked in

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=41
This commit is contained in:
OBS User autobuild 2009-12-08 08:37:49 +00:00 committed by Git OBS Bridge
parent 48745881b1
commit f0a182a099
7 changed files with 387 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
anjuta-2.28.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ac19cee932e2bf773d103f38c92bcdd02105ab6b61c80760a56da95d084077e
size 7495692

3
anjuta-2.29.2.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41a003e76e890525eb5f680a22d03fd0b6865dc968035b06839556f4731c1af6
size 7524421

22
anjuta-gtklabel-crash.patch Normal file
View File

@ -0,0 +1,22 @@
From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001
From: Gennaro Bellizio <genbell@tiscali.it>
Date: Sat, 10 Oct 2009 09:08:10 +0000
Subject: bgo #597815 - Crash due to malformed UI definition file
---
diff --git a/plugins/class-gen/anjuta-class-gen-plugin.ui b/plugins/class-gen/anjuta-class-gen-plugin.ui
index 5b9fa72..c4d445a 100644
--- a/plugins/class-gen/anjuta-class-gen-plugin.ui
+++ b/plugins/class-gen/anjuta-class-gen-plugin.ui
@@ -693,7 +693,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label53">
<property name="visible">True</property>
<property name="label" translatable="yes">Properties</property>
</object>
--
cgit v0.8.2

82
anjuta-launchername.patch Normal file
View File

@ -0,0 +1,82 @@
From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Fri, 09 Oct 2009 19:51:38 +0000
Subject: bgo#597318 - Anjuta terminal crashes X
---
diff --git a/launcher/anjuta-launcher.c b/launcher/anjuta-launcher.c
index f84ad2c..64e4b2f 100644
--- a/launcher/anjuta-launcher.c
+++ b/launcher/anjuta-launcher.c
@@ -1,5 +1,5 @@
/*
- anjuta_launcher.c
+ anjuta-launcher.c
Copyright (C) 2000 Kh. Naba Kumar Singh
This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ main (int argc, char **argv)
if (strcmp (argv[1], "--version") == 0)
{
- printf ("anjuta_launcher version 0.1.2\n");
+ printf ("anjuta-launcher version 0.1.2\n");
exit (0);
}
if (strcmp (argv[1], "--__debug_terminal") == 0)
diff --git a/plugins/build-basic-autotools/executer.c b/plugins/build-basic-autotools/executer.c
index ec14228..45284ff 100644
--- a/plugins/build-basic-autotools/executer.c
+++ b/plugins/build-basic-autotools/executer.c
@@ -410,14 +410,14 @@ execute_program (BasicAutotoolsPlugin* plugin, const gchar *pre_select_uri)
{
gchar* oldcmd = cmd;
- cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+ cmd = g_strconcat ("anjuta-launcher ", oldcmd, NULL);
g_free (oldcmd);
g_free (launcher_path);
}
else
{
- DEBUG_PRINT("%s", "Missing anjuta_launcher");
+ DEBUG_PRINT("%s", "Missing anjuta-launcher");
}
}
diff --git a/plugins/gdb/plugin.c b/plugins/gdb/plugin.c
index 159305b..370d9be 100644
--- a/plugins/gdb/plugin.c
+++ b/plugins/gdb/plugin.c
@@ -116,7 +116,7 @@ gdb_plugin_start_terminal (GdbPlugin* plugin)
}
/* Launch terminal */
- cmd = g_strconcat ("anjuta_launcher --__debug_terminal ", file, NULL);
+ cmd = g_strconcat ("anjuta-launcher --__debug_terminal ", file, NULL);
/* Get terminal plugin */
term = anjuta_shell_get_interface (ANJUTA_PLUGIN (plugin)->shell, IAnjutaTerminal, NULL);
diff --git a/plugins/run-program/execute.c b/plugins/run-program/execute.c
index d1db4b4..3d04501 100644
--- a/plugins/run-program/execute.c
+++ b/plugins/run-program/execute.c
@@ -243,12 +243,12 @@ execute_with_terminal (RunProgramPlugin *plugin,
if (launcher_path != NULL)
{
- new_cmd = g_strconcat ("anjuta_launcher ", cmd, NULL);
+ new_cmd = g_strconcat ("anjuta-launcher ", cmd, NULL);
g_free (launcher_path);
}
else
{
- DEBUG_PRINT("%s", "Missing anjuta_launcher");
+ DEBUG_PRINT("%s", "Missing anjuta-launcher");
new_cmd = g_strdup (cmd);
}
--
cgit v0.8.2

269
anjuta-symboldb-fix.patch Normal file
View File

@ -0,0 +1,269 @@
From f8dc87e60d076f23b23609375747fe77af65ce3d Mon Sep 17 00:00:00 2001
From: Massimo Corà <mcora@src.gnome.org>
Date: Tue, 06 Oct 2009 17:04:06 +0000
Subject: symbol-db: fix #597113
The crash was probably due to #588485. Improved code.
---
diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
index 645a409..1541dfe 100644
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@ -765,15 +765,16 @@ sdb_engine_get_tuple_id_by_unique_name (SymbolDBEngine * dbe, static_query_type
}
ret_value = gda_holder_take_static_value (param, param_value, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
- MP_RETURN_OBJ_STR(priv, ret_value);
- }
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
+ MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
/* execute the query with parametes just set */
@@ -845,16 +846,17 @@ sdb_engine_get_tuple_id_by_unique_name2 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value1, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
/* ...and the second one */
@@ -867,16 +869,17 @@ sdb_engine_get_tuple_id_by_unique_name2 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value2, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
/* execute the query with parametes just set */
data_model = gda_connection_statement_execute_select (priv->db_connection,
@@ -940,16 +943,17 @@ sdb_engine_get_tuple_id_by_unique_name3 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value1, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
/* ...and the second one */
@@ -962,16 +966,17 @@ sdb_engine_get_tuple_id_by_unique_name3 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value2, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
/* ...and the third one */
@@ -984,16 +989,17 @@ sdb_engine_get_tuple_id_by_unique_name3 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value3, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
/* execute the query with parametes just set */
@@ -1059,18 +1065,17 @@ sdb_engine_get_tuple_id_by_unique_name4 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value1, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
-
-
/* ...and the second one */
if ((param = gda_set_get_holder ((GdaSet*)plist, param_key2)) == NULL)
@@ -1081,17 +1086,17 @@ sdb_engine_get_tuple_id_by_unique_name4 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value2, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
-
/* ...and the third one */
if ((param = gda_set_get_holder ((GdaSet*)plist, param_key3)) == NULL)
@@ -1102,17 +1107,17 @@ sdb_engine_get_tuple_id_by_unique_name4 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value3, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
-
/* ...and the fourth one */
if ((param = gda_set_get_holder ((GdaSet*)plist, param_key4)) == NULL)
@@ -1123,17 +1128,17 @@ sdb_engine_get_tuple_id_by_unique_name4 (SymbolDBEngine * dbe,
}
ret_value = gda_holder_take_static_value (param, value4, &ret_bool, NULL);
- if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ if (ret_value != NULL)
{
- if (ret_value != NULL)
+ if (G_VALUE_HOLDS_STRING (ret_value) == TRUE)
+ {
MP_RETURN_OBJ_STR(priv, ret_value);
+ }
+ else
+ {
+ MP_RETURN_OBJ_INT(priv, ret_value);
+ }
}
- else
- {
- if (ret_value != NULL)
- MP_RETURN_OBJ_INT(priv, ret_value);
- }
-
/* execute the query with parametes just set */
data_model = gda_connection_statement_execute_select (priv->db_connection,
--
cgit v0.8.2

28
anjuta.changes
View File

@ -1,31 +1,3 @@
-------------------------------------------------------------------
Fri Dec 4 02:44:48 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.2.0:
+ String review
+ symbol-db: fix bgo#597113
+ search-plugin: unmerge ui and remove action group when the
plugin is deactivated
+ git: remove action groups when the plugin is deactivated
+ file-manager: fix bug where we accessed the FileView even
though it was freed
+ debug-manager: bgo#596009 - Easier adding of watches
+ bgo#601567 - Import from git fails
-------------------------------------------------------------------
Sat Nov 14 11:38:20 CET 2009 - vuntz@opensuse.org
- Update to version 2.28.1.0:
+ Fix check if the executable is part of the debug configuration
+ bgo#597318 - Anjuta terminal crashes X
+ symbol-db: fix #597113
+ subversion: Fix duplicate IDs in the glade file (bgo#596001)
+ file-loader: bgo#567363 - drag and drop from gnome-search-tool
yields garbage message
- Drop anjuta-symboldb-fix.patch: fixed upstream.
- Drop anjuta-launchername.patch: fixed upstream.
- Drop anjuta-gtklabel-crash.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 17 20:24:25 CEST 2009 - dimstar@opensuse.org Sat Oct 17 20:24:25 CEST 2009 - dimstar@opensuse.org

17
anjuta.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package anjuta (Version 2.29.2.0) # spec file for package anjuta (Version 2.28.0.0)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,14 +18,20 @@
Name: anjuta Name: anjuta
Version: 2.29.2.0 Version: 2.28.0.0
Release: 1 Release: 2
License: GPL v2 or later License: GPL v2 or later
Summary: GNOME IDE for C and C++ Summary: GNOME IDE for C and C++
Url: http://anjuta.sourceforge.net/ Url: http://anjuta.sourceforge.net/
Group: Development/Tools/IDE Group: Development/Tools/IDE
Source: anjuta-%{version}.tar.bz2 Source: anjuta-%{version}.tar.bz2
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM bcn#547672 dimstar@opensuse.org -- Patch taken from git commit f8dc87e
Patch0: anjuta-symboldb-fix.patch
# PATCH-FIX-UPSTREAM bnc#547917 bgo#597318 dimstar@opensuse.org -- anjuta-launcher was renamed. Patch fixes X crashing.
Patch1: anjuta-launchername.patch
# PATCH-FIX-UPSTREAM bgo#597815 dimstar@opensuse.org -- Crash due to malformed UI definition file
Patch2: anjuta-gtklabel-crash.patch
BuildRequires: autogen BuildRequires: autogen
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: devhelp-devel BuildRequires: devhelp-devel
@ -106,6 +112,8 @@ and can be unfriendly to use.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%build %build
%configure\ %configure\
@ -115,9 +123,6 @@ make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# These should go to defaultdocdir. # These should go to defaultdocdir.
rm -r %{buildroot}%{_datadir}/doc rm -r %{buildroot}%{_datadir}/doc
DESTDIR=%{buildroot} mime-info-to-mime DESTDIR=%{buildroot} mime-info-to-mime