diff -u anjuta-2.28.0.0/debian/changelog anjuta-2.28.0.0/debian/changelog --- anjuta-2.28.0.0/debian/changelog +++ anjuta-2.28.0.0/debian/changelog @@ -1,3 +1,10 @@ +anjuta (2:2.28.0.0-0ubuntu2) karmic; urgency=low + + * fix-symbol_db-segfault.patch: Fix segfault on project creation (LP: #442725) (bgo 597113) + (patch from upstream git) + + -- Hugues Fournier Wed, 07 Oct 2009 20:39:48 +0200 + anjuta (2:2.28.0.0-0ubuntu1) karmic; urgency=low * New upstream version (LP: #423635) diff -u anjuta-2.28.0.0/debian/control anjuta-2.28.0.0/debian/control --- anjuta-2.28.0.0/debian/control +++ anjuta-2.28.0.0/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Rob Bradford -Uploaders: Debian GNOME Maintainers , Josselin Mouette +Uploaders: Debian GNOME Maintainers Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/anjuta/ubuntu Build-Depends: debhelper (>= 5.0.0), quilt, diff -u anjuta-2.28.0.0/debian/patches/series anjuta-2.28.0.0/debian/patches/series --- anjuta-2.28.0.0/debian/patches/series +++ anjuta-2.28.0.0/debian/patches/series @@ -1 +1 @@ -# no patch in series +fix-symbol_db-segfault.patch only in patch2: unchanged: --- anjuta-2.28.0.0.orig/debian/patches/fix-symbol_db-segfault.patch +++ anjuta-2.28.0.0/debian/patches/fix-symbol_db-segfault.patch @@ -0,0 +1,259 @@ +Index: anjuta-2.28.0.0/plugins/symbol-db/symbol-db-engine-core.c +=================================================================== +--- anjuta-2.28.0.0.orig/plugins/symbol-db/symbol-db-engine-core.c 2009-10-07 20:06:57.562744317 +0200 ++++ anjuta-2.28.0.0/plugins/symbol-db/symbol-db-engine-core.c 2009-10-07 20:07:10.354755734 +0200 +@@ -765,15 +765,16 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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,