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\