From 01bb91d3c98da0bb722739c0fae96d8e12be7346 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 16 Oct 2009 18:33:33 +0000 Subject: [PATCH 1/8] Accepting request 22523 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/anjuta via accept of submit request 22523 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/22523 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=35 --- anjuta-symboldb-fix.patch | 269 ++++++++++++++++++++++++++++++++++++++ anjuta.changes | 6 + anjuta.spec | 3 + 3 files changed, 278 insertions(+) create mode 100644 anjuta-symboldb-fix.patch diff --git a/anjuta-symboldb-fix.patch b/anjuta-symboldb-fix.patch new file mode 100644 index 0000000..a5fb944 --- /dev/null +++ b/anjuta-symboldb-fix.patch @@ -0,0 +1,269 @@ +From f8dc87e60d076f23b23609375747fe77af65ce3d Mon Sep 17 00:00:00 2001 +From: Massimo Corà +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 + diff --git a/anjuta.changes b/anjuta.changes index 11b7d97..e878cc1 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 16 18:59:18 CEST 2009 - dimstar@opensuse.org + +- Add anjuta-symboldb-fix.patch, fix crash, bnc#547672, taken from + upstream git. + ------------------------------------------------------------------- Tue Sep 22 18:12:08 CEST 2009 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index dff6d0b..c2561b9 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -26,6 +26,8 @@ Url: http://anjuta.sourceforge.net/ Group: Development/Tools/IDE Source: anjuta-%{version}.tar.bz2 Source1: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM bcn#547672 dimstar@opensuse.org -- Patch taken from git commit f8dc87e +Patch0: anjuta-symboldb-fix.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: devhelp-devel @@ -106,6 +108,7 @@ and can be unfriendly to use. %lang_package %prep %setup -q +%patch0 -p1 %build %configure\ From 4266a60f632e7573c9e0ea42a1150447a434780e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 18 Oct 2009 10:46:08 +0000 Subject: [PATCH 2/8] Accepting request 22549 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/anjuta via accept of submit request 22549 revision 5. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/22549 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=36 --- anjuta-gtklabel-crash.patch | 22 ++++++++++ anjuta-launchername.patch | 82 +++++++++++++++++++++++++++++++++++++ anjuta.changes | 8 ++++ anjuta.spec | 5 +++ 4 files changed, 117 insertions(+) create mode 100644 anjuta-gtklabel-crash.patch create mode 100644 anjuta-launchername.patch diff --git a/anjuta-gtklabel-crash.patch b/anjuta-gtklabel-crash.patch new file mode 100644 index 0000000..fa12c1c --- /dev/null +++ b/anjuta-gtklabel-crash.patch @@ -0,0 +1,22 @@ +From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001 +From: Gennaro Bellizio +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 @@ + + + +- ++ + True + Properties + +-- +cgit v0.8.2 + diff --git a/anjuta-launchername.patch b/anjuta-launchername.patch new file mode 100644 index 0000000..c1ed399 --- /dev/null +++ b/anjuta-launchername.patch @@ -0,0 +1,82 @@ +From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001 +From: Sébastien Granjoux +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 + diff --git a/anjuta.changes b/anjuta.changes index e878cc1..cb10e21 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 17 20:24:25 CEST 2009 - dimstar@opensuse.org + +- Add anjuta-launchername.patch, fixes X resets, bgo#597318, + bnc#547917. +- Add anjuta-gtklabel-crash.patch, fixes crash due to malformed + UI definition file, bgo#597815. + ------------------------------------------------------------------- Fri Oct 16 18:59:18 CEST 2009 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index c2561b9..b7013ef 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -28,6 +28,10 @@ Source: anjuta-%{version}.tar.bz2 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: binutils-devel BuildRequires: devhelp-devel @@ -109,6 +113,7 @@ and can be unfriendly to use. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure\ From 04cb50779c1a6e3b9eb808f8c54dcdf4639a5341 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 21:43:18 +0000 Subject: [PATCH 3/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=37 --- anjuta-gtklabel-crash.patch | 22 --- anjuta-launchername.patch | 82 ----------- anjuta-symboldb-fix.patch | 269 ------------------------------------ anjuta.changes | 14 -- anjuta.spec | 8 -- 5 files changed, 395 deletions(-) delete mode 100644 anjuta-gtklabel-crash.patch delete mode 100644 anjuta-launchername.patch delete mode 100644 anjuta-symboldb-fix.patch diff --git a/anjuta-gtklabel-crash.patch b/anjuta-gtklabel-crash.patch deleted file mode 100644 index fa12c1c..0000000 --- a/anjuta-gtklabel-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001 -From: Gennaro Bellizio -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 @@ - - - -- -+ - True - Properties - --- -cgit v0.8.2 - diff --git a/anjuta-launchername.patch b/anjuta-launchername.patch deleted file mode 100644 index c1ed399..0000000 --- a/anjuta-launchername.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001 -From: Sébastien Granjoux -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 - diff --git a/anjuta-symboldb-fix.patch b/anjuta-symboldb-fix.patch deleted file mode 100644 index a5fb944..0000000 --- a/anjuta-symboldb-fix.patch +++ /dev/null @@ -1,269 +0,0 @@ -From f8dc87e60d076f23b23609375747fe77af65ce3d Mon Sep 17 00:00:00 2001 -From: Massimo Corà -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 - diff --git a/anjuta.changes b/anjuta.changes index cb10e21..11b7d97 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Sat Oct 17 20:24:25 CEST 2009 - dimstar@opensuse.org - -- Add anjuta-launchername.patch, fixes X resets, bgo#597318, - bnc#547917. -- Add anjuta-gtklabel-crash.patch, fixes crash due to malformed - UI definition file, bgo#597815. - -------------------------------------------------------------------- -Fri Oct 16 18:59:18 CEST 2009 - dimstar@opensuse.org - -- Add anjuta-symboldb-fix.patch, fix crash, bnc#547672, taken from - upstream git. - ------------------------------------------------------------------- Tue Sep 22 18:12:08 CEST 2009 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index b7013ef..dff6d0b 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -26,12 +26,6 @@ Url: http://anjuta.sourceforge.net/ Group: Development/Tools/IDE Source: anjuta-%{version}.tar.bz2 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: binutils-devel BuildRequires: devhelp-devel @@ -112,8 +106,6 @@ and can be unfriendly to use. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure\ From 9566157717d9a9aef15c42daaf3f209a0671ce08 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Nov 2009 15:00:41 +0000 Subject: [PATCH 4/8] Accepting request 24367 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/anjuta via accept of submit request 24367 revision 29. Request was accepted with message: Looks fine OBS-URL: https://build.opensuse.org/request/show/24367 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=38 --- anjuta-2.28.0.0.tar.bz2 | 3 --- anjuta-2.28.1.0.tar.bz2 | 3 +++ anjuta.changes | 28 ++++++++++++++++++++++++++++ anjuta.spec | 4 ++-- 4 files changed, 33 insertions(+), 5 deletions(-) delete mode 100644 anjuta-2.28.0.0.tar.bz2 create mode 100644 anjuta-2.28.1.0.tar.bz2 diff --git a/anjuta-2.28.0.0.tar.bz2 b/anjuta-2.28.0.0.tar.bz2 deleted file mode 100644 index 2b35d21..0000000 --- a/anjuta-2.28.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac19cee932e2bf773d103f38c92bcdd02105ab6b61c80760a56da95d084077e -size 7495692 diff --git a/anjuta-2.28.1.0.tar.bz2 b/anjuta-2.28.1.0.tar.bz2 new file mode 100644 index 0000000..4710620 --- /dev/null +++ b/anjuta-2.28.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31c888c2a51e8e103c71b6563324d2fc5ffad2ad08df7a42c82d1e1a55931b02 +size 7537430 diff --git a/anjuta.changes b/anjuta.changes index 11b7d97..247b5a4 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +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 + +- Add anjuta-launchername.patch, fixes X resets, bgo#597318, + bnc#547917. +- Add anjuta-gtklabel-crash.patch, fixes crash due to malformed + UI definition file, bgo#597815. + +------------------------------------------------------------------- +Fri Oct 16 18:59:18 CEST 2009 - dimstar@opensuse.org + +- Add anjuta-symboldb-fix.patch, fix crash, bnc#547672, taken from + upstream git. + ------------------------------------------------------------------- Tue Sep 22 18:12:08 CEST 2009 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index dff6d0b..2fcaa83 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 2.28.0.0) +# spec file for package anjuta (Version 2.28.1.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: anjuta -Version: 2.28.0.0 +Version: 2.28.1.0 Release: 1 License: GPL v2 or later Summary: GNOME IDE for C and C++ From 84d1dcc7dfdc6dbcd0ca25915d277d222a87e53f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 4 Dec 2009 22:48:40 +0000 Subject: [PATCH 5/8] Accepting request 25555 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/anjuta via accept of submit request 25555 revision 3. Request was accepted with message: Accepting OBS-URL: https://build.opensuse.org/request/show/25555 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=39 --- anjuta-2.28.1.0.tar.bz2 | 3 --- anjuta-2.29.2.0.tar.bz2 | 3 +++ anjuta.changes | 14 ++++++++++++++ anjuta.spec | 8 ++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 anjuta-2.28.1.0.tar.bz2 create mode 100644 anjuta-2.29.2.0.tar.bz2 diff --git a/anjuta-2.28.1.0.tar.bz2 b/anjuta-2.28.1.0.tar.bz2 deleted file mode 100644 index 4710620..0000000 --- a/anjuta-2.28.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31c888c2a51e8e103c71b6563324d2fc5ffad2ad08df7a42c82d1e1a55931b02 -size 7537430 diff --git a/anjuta-2.29.2.0.tar.bz2 b/anjuta-2.29.2.0.tar.bz2 new file mode 100644 index 0000000..4932bcc --- /dev/null +++ b/anjuta-2.29.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41a003e76e890525eb5f680a22d03fd0b6865dc968035b06839556f4731c1af6 +size 7524421 diff --git a/anjuta.changes b/anjuta.changes index 247b5a4..5e388bf 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 diff --git a/anjuta.spec b/anjuta.spec index 2fcaa83..ba2809c 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 2.28.1.0) +# spec file for package anjuta (Version 2.29.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,8 @@ Name: anjuta -Version: 2.28.1.0 +Version: 2.29.2.0 +# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 License: GPL v2 or later Summary: GNOME IDE for C and C++ @@ -115,6 +116,9 @@ make %{?jobs:-j%jobs} %install %makeinstall +# %if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +# %endif # These should go to defaultdocdir. rm -r %{buildroot}%{_datadir}/doc DESTDIR=%{buildroot} mime-info-to-mime From 48745881b1366789d79ca0e62e0be6d7b5eff7a1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 7 Dec 2009 13:32:25 +0000 Subject: [PATCH 6/8] en@shaw OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=40 --- anjuta.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anjuta.spec b/anjuta.spec index ba2809c..e10377d 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -19,7 +19,6 @@ Name: anjuta Version: 2.29.2.0 -# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 License: GPL v2 or later Summary: GNOME IDE for C and C++ @@ -116,9 +115,9 @@ make %{?jobs:-j%jobs} %install %makeinstall -# %if 0%{?suse_version} <= 1120 +%if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -# %endif +%endif # These should go to defaultdocdir. rm -r %{buildroot}%{_datadir}/doc DESTDIR=%{buildroot} mime-info-to-mime From f0a182a09933cd75e9decde73ac44b2d04487be1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 08:37:49 +0000 Subject: [PATCH 7/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=41 --- anjuta-2.28.0.0.tar.bz2 | 3 + anjuta-2.29.2.0.tar.bz2 | 3 - anjuta-gtklabel-crash.patch | 22 +++ anjuta-launchername.patch | 82 +++++++++++ anjuta-symboldb-fix.patch | 269 ++++++++++++++++++++++++++++++++++++ anjuta.changes | 28 ---- anjuta.spec | 17 ++- 7 files changed, 387 insertions(+), 37 deletions(-) create mode 100644 anjuta-2.28.0.0.tar.bz2 delete mode 100644 anjuta-2.29.2.0.tar.bz2 create mode 100644 anjuta-gtklabel-crash.patch create mode 100644 anjuta-launchername.patch create mode 100644 anjuta-symboldb-fix.patch diff --git a/anjuta-2.28.0.0.tar.bz2 b/anjuta-2.28.0.0.tar.bz2 new file mode 100644 index 0000000..2b35d21 --- /dev/null +++ b/anjuta-2.28.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ac19cee932e2bf773d103f38c92bcdd02105ab6b61c80760a56da95d084077e +size 7495692 diff --git a/anjuta-2.29.2.0.tar.bz2 b/anjuta-2.29.2.0.tar.bz2 deleted file mode 100644 index 4932bcc..0000000 --- a/anjuta-2.29.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41a003e76e890525eb5f680a22d03fd0b6865dc968035b06839556f4731c1af6 -size 7524421 diff --git a/anjuta-gtklabel-crash.patch b/anjuta-gtklabel-crash.patch new file mode 100644 index 0000000..fa12c1c --- /dev/null +++ b/anjuta-gtklabel-crash.patch @@ -0,0 +1,22 @@ +From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001 +From: Gennaro Bellizio +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 @@ + + + +- ++ + True + Properties + +-- +cgit v0.8.2 + diff --git a/anjuta-launchername.patch b/anjuta-launchername.patch new file mode 100644 index 0000000..c1ed399 --- /dev/null +++ b/anjuta-launchername.patch @@ -0,0 +1,82 @@ +From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001 +From: Sébastien Granjoux +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 + diff --git a/anjuta-symboldb-fix.patch b/anjuta-symboldb-fix.patch new file mode 100644 index 0000000..a5fb944 --- /dev/null +++ b/anjuta-symboldb-fix.patch @@ -0,0 +1,269 @@ +From f8dc87e60d076f23b23609375747fe77af65ce3d Mon Sep 17 00:00:00 2001 +From: Massimo Corà +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 + diff --git a/anjuta.changes b/anjuta.changes index 5e388bf..cb10e21 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -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 diff --git a/anjuta.spec b/anjuta.spec index e10377d..9a7328d 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -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. # @@ -18,14 +18,20 @@ Name: anjuta -Version: 2.29.2.0 -Release: 1 +Version: 2.28.0.0 +Release: 2 License: GPL v2 or later Summary: GNOME IDE for C and C++ Url: http://anjuta.sourceforge.net/ Group: Development/Tools/IDE Source: anjuta-%{version}.tar.bz2 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: binutils-devel BuildRequires: devhelp-devel @@ -106,6 +112,8 @@ and can be unfriendly to use. %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure\ @@ -115,9 +123,6 @@ make %{?jobs:-j%jobs} %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif # These should go to defaultdocdir. rm -r %{buildroot}%{_datadir}/doc DESTDIR=%{buildroot} mime-info-to-mime From 56e7ac2f234c7733f1c8cb8ce4b060fe45cec7ca Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 8 Dec 2009 08:37:50 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/anjuta revision 37.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=a6492d4b6aa8f214dee166e5706302f2 --- anjuta-2.28.0.0.tar.bz2 | 3 - anjuta-2.29.2.0.tar.bz2 | 3 + anjuta-gtklabel-crash.patch | 22 --- anjuta-launchername.patch | 82 ----------- anjuta-symboldb-fix.patch | 269 ------------------------------------ anjuta.changes | 28 ++++ anjuta.spec | 23 ++- 7 files changed, 40 insertions(+), 390 deletions(-) delete mode 100644 anjuta-2.28.0.0.tar.bz2 create mode 100644 anjuta-2.29.2.0.tar.bz2 delete mode 100644 anjuta-gtklabel-crash.patch delete mode 100644 anjuta-launchername.patch delete mode 100644 anjuta-symboldb-fix.patch diff --git a/anjuta-2.28.0.0.tar.bz2 b/anjuta-2.28.0.0.tar.bz2 deleted file mode 100644 index 2b35d21..0000000 --- a/anjuta-2.28.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac19cee932e2bf773d103f38c92bcdd02105ab6b61c80760a56da95d084077e -size 7495692 diff --git a/anjuta-2.29.2.0.tar.bz2 b/anjuta-2.29.2.0.tar.bz2 new file mode 100644 index 0000000..4932bcc --- /dev/null +++ b/anjuta-2.29.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41a003e76e890525eb5f680a22d03fd0b6865dc968035b06839556f4731c1af6 +size 7524421 diff --git a/anjuta-gtklabel-crash.patch b/anjuta-gtklabel-crash.patch deleted file mode 100644 index fa12c1c..0000000 --- a/anjuta-gtklabel-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001 -From: Gennaro Bellizio -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 @@ - - - -- -+ - True - Properties - --- -cgit v0.8.2 - diff --git a/anjuta-launchername.patch b/anjuta-launchername.patch deleted file mode 100644 index c1ed399..0000000 --- a/anjuta-launchername.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001 -From: Sébastien Granjoux -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 - diff --git a/anjuta-symboldb-fix.patch b/anjuta-symboldb-fix.patch deleted file mode 100644 index a5fb944..0000000 --- a/anjuta-symboldb-fix.patch +++ /dev/null @@ -1,269 +0,0 @@ -From f8dc87e60d076f23b23609375747fe77af65ce3d Mon Sep 17 00:00:00 2001 -From: Massimo Corà -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 - diff --git a/anjuta.changes b/anjuta.changes index cb10e21..5e388bf 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +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 diff --git a/anjuta.spec b/anjuta.spec index 9a7328d..02ee327 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 2.28.0.0) +# spec file for package anjuta (Version 2.29.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,20 +18,14 @@ Name: anjuta -Version: 2.28.0.0 -Release: 2 -License: GPL v2 or later +Version: 2.29.2.0 +Release: 1 +License: GPLv2+ Summary: GNOME IDE for C and C++ Url: http://anjuta.sourceforge.net/ Group: Development/Tools/IDE Source: anjuta-%{version}.tar.bz2 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: binutils-devel BuildRequires: devhelp-devel @@ -79,7 +73,7 @@ available for the GNU system. These are usually run via a text console and can be unfriendly to use. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: GNOME IDE for C and C++ Group: Development/Tools/IDE Requires: %{name} = %{version} @@ -96,7 +90,7 @@ available for the GNU system. These are usually run via a text console and can be unfriendly to use. %package doc -License: GPL v2 or later +License: GPLv2+ Summary: GNOME IDE for C and C++ Group: Development/Tools/IDE Requires: %{name} = %{version} @@ -112,8 +106,6 @@ and can be unfriendly to use. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure\ @@ -123,6 +115,9 @@ make %{?jobs:-j%jobs} %install %makeinstall +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif # These should go to defaultdocdir. rm -r %{buildroot}%{_datadir}/doc DESTDIR=%{buildroot} mime-info-to-mime