Package: gmysqlcc Severity: minor Usertags: clang-ftbfs User: pkg-llvm-t...@lists.alioth.debian.org Tag: patch
Hello, Using the rebuild infrastructure, your package fails to build with clang (instead of gcc). Thanks, Arthur
diff -Naur gmysqlcc.orig/gmysqlcc-0.3.0/debian/changelog gmysqlcc/gmysqlcc-0.3.0/debian/changelog --- gmysqlcc.orig/gmysqlcc-0.3.0/debian/changelog 2014-06-02 16:02:08.465020340 -0500 +++ gmysqlcc/gmysqlcc-0.3.0/debian/changelog 2014-06-02 16:34:38.721054303 -0500 @@ -1,3 +1,14 @@ +gmysqlcc (0.3.0-4) unstable; urgency=low + + * Fix FTBFS with clang: + - Fixed "function declaration not allowed here" error in + src/gmlc_gui_server_tab_data.c + src/gmlc_misc_hashtable.c + src/gmlc_mysql_database.c + src/gmlc_mysql_server.c + + -- Arthur Marble <art...@info9.net> Mon, 02 Jun 2014 16:34:38 -0500 + gmysqlcc (0.3.0-3) unstable; urgency=low * debian/control diff -Naur gmysqlcc.orig/gmysqlcc-0.3.0/debian/patches/clang-ftbfs.diff gmysqlcc/gmysqlcc-0.3.0/debian/patches/clang-ftbfs.diff --- gmysqlcc.orig/gmysqlcc-0.3.0/debian/patches/clang-ftbfs.diff 1969-12-31 18:00:00.000000000 -0600 +++ gmysqlcc/gmysqlcc-0.3.0/debian/patches/clang-ftbfs.diff 2014-06-02 16:32:49.445052400 -0500 @@ -0,0 +1,356 @@ +--- a/src/gmlc_gui_server_tab_data.c ++++ b/src/gmlc_gui_server_tab_data.c +@@ -669,24 +669,24 @@ void gmlc_gui_server_tab_data_open_query + g_free(pcSql); + } + ++void sub_ht_fill_database_list(gpointer key, gpointer value, gpointer user_data) { ++ GmlcMysqlDatabase * pGmlcMysqlDb = GMLC_MYSQL_DATABASE(value); ++ GtkListStore * lstStrBase = GTK_LIST_STORE(user_data); ++ GtkTreeIter iter; ++ gchar * pcName = NULL; ++ ++ g_object_get(G_OBJECT(pGmlcMysqlDb), "db_name", &pcName, NULL); ++ ++ gtk_list_store_append (lstStrBase, &iter); ++ gtk_list_store_set (lstStrBase, &iter, 0, pcName, 1, pGmlcMysqlDb, -1); ++} ++ + void gmlc_gui_server_tab_data_fill_database_list (GmlcGuiServerTabData * pGmlcGuiSrvTabData) { + GtkListStore * lstStrBase = NULL, * lstEmpty = NULL; + glong lServerVersion = 0; + + g_object_get(G_OBJECT(pGmlcGuiSrvTabData->pGmlcMysqlSrv), "version", &lServerVersion, NULL); + +- void sub_ht_fill_database_list(gpointer key, gpointer value, gpointer user_data) { +- GmlcMysqlDatabase * pGmlcMysqlDb = GMLC_MYSQL_DATABASE(value); +- GtkListStore * lstStrBase = GTK_LIST_STORE(user_data); +- GtkTreeIter iter; +- gchar * pcName = NULL; +- +- g_object_get(G_OBJECT(pGmlcMysqlDb), "db_name", &pcName, NULL); +- +- gtk_list_store_append (lstStrBase, &iter); +- gtk_list_store_set (lstStrBase, &iter, 0, pcName, 1, pGmlcMysqlDb, -1); +- } +- + lstStrBase = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(lstStrBase), 0, GTK_SORT_ASCENDING); + +@@ -722,20 +722,21 @@ void gmlc_gui_server_tab_data_fill_datab + pGmlcGuiSrvTabData->pGmlcMysqlFunc = NULL; + } + ++void sub_ht_fill_table_list(gpointer key, gpointer value, gpointer user_data) { ++ GmlcMysqlTable * pGmlcMysqlTbl = GMLC_MYSQL_TABLE(value); ++ GtkListStore * lstStrTable = GTK_LIST_STORE(user_data); ++ GtkTreeIter iter; ++ gchar * pcName = NULL, * pcRows = NULL, * pcSize = NULL, * pcEngine = NULL; ++ ++ g_object_get(G_OBJECT(pGmlcMysqlTbl), "name", &pcName, "rows", &pcRows, "size", &pcSize, "engine", &pcEngine, NULL); ++ ++ gtk_list_store_append (lstStrTable, &iter); ++ gtk_list_store_set (lstStrTable, &iter, 0, pcName, 1, pcRows, 2, pcSize, 3, pcEngine, 4, pGmlcMysqlTbl, -1); ++} ++ + void gmlc_gui_server_tab_data_fill_tables_list (GmlcGuiServerTabData * pGmlcGuiSrvTabData) { + GtkListStore * lstStrTable; + +- void sub_ht_fill_table_list(gpointer key, gpointer value, gpointer user_data) { +- GmlcMysqlTable * pGmlcMysqlTbl = GMLC_MYSQL_TABLE(value); +- GtkListStore * lstStrTable = GTK_LIST_STORE(user_data); +- GtkTreeIter iter; +- gchar * pcName = NULL, * pcRows = NULL, * pcSize = NULL, * pcEngine = NULL; +- +- g_object_get(G_OBJECT(pGmlcMysqlTbl), "name", &pcName, "rows", &pcRows, "size", &pcSize, "engine", &pcEngine, NULL); +- +- gtk_list_store_append (lstStrTable, &iter); +- gtk_list_store_set (lstStrTable, &iter, 0, pcName, 1, pcRows, 2, pcSize, 3, pcEngine, 4, pGmlcMysqlTbl, -1); +- } + + lstStrTable = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(lstStrTable), 0, GTK_SORT_ASCENDING); +@@ -751,20 +752,21 @@ void gmlc_gui_server_tab_data_fill_table + pGmlcGuiSrvTabData->pGmlcMysqlTbl = NULL; + } + ++void sub_ht_fill_view_list(gpointer key, gpointer value, gpointer user_data) { ++ GmlcMysqlView * pGmlcMysqlVw = GMLC_MYSQL_VIEW(value); ++ GtkListStore * lstStrView = GTK_LIST_STORE(user_data); ++ GtkTreeIter iter; ++ gchar * pcName = NULL; ++ ++ g_object_get(G_OBJECT(pGmlcMysqlVw), "name", &pcName, NULL); ++ ++ gtk_list_store_append (lstStrView, &iter); ++ gtk_list_store_set (lstStrView, &iter, 0, pcName, 1, pGmlcMysqlVw, -1); ++} ++ + void gmlc_gui_server_tab_data_fill_views_list (GmlcGuiServerTabData * pGmlcGuiSrvTabData) { + GtkListStore * lstStrView; + +- void sub_ht_fill_view_list(gpointer key, gpointer value, gpointer user_data) { +- GmlcMysqlView * pGmlcMysqlVw = GMLC_MYSQL_VIEW(value); +- GtkListStore * lstStrView = GTK_LIST_STORE(user_data); +- GtkTreeIter iter; +- gchar * pcName = NULL; +- +- g_object_get(G_OBJECT(pGmlcMysqlVw), "name", &pcName, NULL); +- +- gtk_list_store_append (lstStrView, &iter); +- gtk_list_store_set (lstStrView, &iter, 0, pcName, 1, pGmlcMysqlVw, -1); +- } + + lstStrView = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(lstStrView), 0, GTK_SORT_ASCENDING); +@@ -780,21 +782,21 @@ void gmlc_gui_server_tab_data_fill_views + pGmlcGuiSrvTabData->pGmlcMysqlVw = NULL; + } + ++void sub_ht_fill_procedure_list(gpointer key, gpointer value, gpointer user_data) { ++ GmlcMysqlProcedure * pGmlcMysqlProc = GMLC_MYSQL_PROCEDURE(value); ++ GtkListStore * lstStrProcedure = GTK_LIST_STORE(user_data); ++ GtkTreeIter iter; ++ gchar * pcName = NULL; ++ ++ g_object_get(G_OBJECT(pGmlcMysqlProc), "name", &pcName, NULL); ++ ++ gtk_list_store_append (lstStrProcedure, &iter); ++ gtk_list_store_set (lstStrProcedure, &iter, 0, pcName, 1, pGmlcMysqlProc, -1); ++} ++ + void gmlc_gui_server_tab_data_fill_procedures_list (GmlcGuiServerTabData * pGmlcGuiSrvTabData) { + GtkListStore * lstStrProcedure; + +- void sub_ht_fill_procedure_list(gpointer key, gpointer value, gpointer user_data) { +- GmlcMysqlProcedure * pGmlcMysqlProc = GMLC_MYSQL_PROCEDURE(value); +- GtkListStore * lstStrProcedure = GTK_LIST_STORE(user_data); +- GtkTreeIter iter; +- gchar * pcName = NULL; +- +- g_object_get(G_OBJECT(pGmlcMysqlProc), "name", &pcName, NULL); +- +- gtk_list_store_append (lstStrProcedure, &iter); +- gtk_list_store_set (lstStrProcedure, &iter, 0, pcName, 1, pGmlcMysqlProc, -1); +- } +- + lstStrProcedure = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(lstStrProcedure), 0, GTK_SORT_ASCENDING); + +@@ -809,20 +811,20 @@ void gmlc_gui_server_tab_data_fill_proce + pGmlcGuiSrvTabData->pGmlcMysqlProc = NULL; + } + ++void sub_ht_fill_function_list(gpointer key, gpointer value, gpointer user_data) { ++ GmlcMysqlFunction * pGmlcMysqlFunc = GMLC_MYSQL_FUNCTION(value); ++ GtkListStore * lstStrFunction = GTK_LIST_STORE(user_data); ++ GtkTreeIter iter; ++ gchar * pcName = NULL; ++ ++ g_object_get(G_OBJECT(pGmlcMysqlFunc), "name", &pcName, NULL); ++ ++ gtk_list_store_append (lstStrFunction, &iter); ++ gtk_list_store_set (lstStrFunction, &iter, 0, pcName, 1, pGmlcMysqlFunc, -1); ++} ++ + void gmlc_gui_server_tab_data_fill_functions_list (GmlcGuiServerTabData * pGmlcGuiSrvTabData) { + GtkListStore * lstStrFunction; +- +- void sub_ht_fill_function_list(gpointer key, gpointer value, gpointer user_data) { +- GmlcMysqlFunction * pGmlcMysqlFunc = GMLC_MYSQL_FUNCTION(value); +- GtkListStore * lstStrFunction = GTK_LIST_STORE(user_data); +- GtkTreeIter iter; +- gchar * pcName = NULL; +- +- g_object_get(G_OBJECT(pGmlcMysqlFunc), "name", &pcName, NULL); +- +- gtk_list_store_append (lstStrFunction, &iter); +- gtk_list_store_set (lstStrFunction, &iter, 0, pcName, 1, pGmlcMysqlFunc, -1); +- } + + lstStrFunction = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(lstStrFunction), 0, GTK_SORT_ASCENDING); +--- a/src/gmlc_misc_hashtable.c ++++ b/src/gmlc_misc_hashtable.c +@@ -25,30 +25,30 @@ gboolean gmlc_misc_hash_table_set_flag(G + return TRUE; + } + ++void internal_gmlc_misc_hash_table_set_flag (gpointer key, gpointer value, gpointer user_data) { ++ GObject * oDataItem = G_OBJECT(value); ++ gboolean bFlag = *((gboolean *)user_data); ++ ++ g_object_set(oDataItem, "flagged", bFlag, NULL); ++} ++ + gboolean gmlc_misc_hash_table_set_all_flag(GHashTable * htbLstObjects, gboolean bNewValue) { + +- void internal_gmlc_misc_hash_table_set_flag (gpointer key, gpointer value, gpointer user_data) { +- GObject * oDataItem = G_OBJECT(value); +- gboolean bFlag = *((gboolean *)user_data); +- +- g_object_set(oDataItem, "flagged", bFlag, NULL); +- } +- + g_hash_table_foreach(htbLstObjects, &internal_gmlc_misc_hash_table_set_flag, &bNewValue); + + return TRUE; + } + +-gboolean gmlc_misc_hash_table_remove_unflag_object(GHashTable * htbLstObjects) { ++gboolean internal_gmlc_misc_hash_table_remove_unflag_object (gpointer key, gpointer value, gpointer user_data) { ++ GObject * oDataItem = G_OBJECT(value); ++ gboolean bFlag = FALSE; ++ ++ g_object_get(oDataItem, "flagged", &bFlag, NULL); ++ ++ return !bFlag; ++} + +- gboolean internal_gmlc_misc_hash_table_remove_unflag_object (gpointer key, gpointer value, gpointer user_data) { +- GObject * oDataItem = G_OBJECT(value); +- gboolean bFlag = FALSE; +- +- g_object_get(oDataItem, "flagged", &bFlag, NULL); +- +- return !bFlag; +- } ++gboolean gmlc_misc_hash_table_remove_unflag_object(GHashTable * htbLstObjects) { + + g_hash_table_foreach_remove(htbLstObjects, &internal_gmlc_misc_hash_table_remove_unflag_object, NULL); + +--- a/src/gmlc_mysql_server.c ++++ b/src/gmlc_mysql_server.c +@@ -229,17 +229,17 @@ gchar * gmlc_mysql_server_generate_xml_c + return pcRet; + } + ++void internal_gmlc_mysql_server_database_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { ++ gchar * pcName = (gchar *) key; ++ GArray * arList = (GArray *) user_data; ++ UNUSED_VAR(value); ++ ++ g_array_append_val(arList, pcName); ++} ++ + GArray * gmlc_mysql_server_databases_name_list (GmlcMysqlServer * pGmlcMysqlSrv, gboolean bUpdateList) { + GArray * arList = NULL; + +- void internal_gmlc_mysql_server_database_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { +- gchar * pcName = (gchar *) key; +- GArray * arList = (GArray *) user_data; +- UNUSED_VAR(value); +- +- g_array_append_val(arList, pcName); +- } +- + if (bUpdateList) { + gmlc_mysql_server_update_databases_list(pGmlcMysqlSrv); + } +--- a/src/gmlc_mysql_database.c ++++ b/src/gmlc_mysql_database.c +@@ -185,17 +185,17 @@ GmlcMysqlQuery * gmlc_mysql_database_get + return poGmlcMysqlQry; + } + ++void internal_gmlc_mysql_database_tables_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { ++ gchar * pcName = (gchar *) key; ++ GArray * arList = (GArray *) user_data; ++ UNUSED_VAR(value); ++ ++ g_array_append_val(arList, pcName); ++} ++ + GArray * gmlc_mysql_database_tables_name_list(GmlcMysqlDatabase * pGmlcMysqlDb, gboolean bUpdateList) { + GArray * arList = NULL; +- +- void internal_gmlc_mysql_database_tables_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { +- gchar * pcName = (gchar *) key; +- GArray * arList = (GArray *) user_data; +- UNUSED_VAR(value); + +- g_array_append_val(arList, pcName); +- } +- + if (bUpdateList) { + gmlc_mysql_database_update_tables_list(pGmlcMysqlDb); + } +@@ -300,17 +300,17 @@ gchar * gmlc_mysql_database_create_new_t + return pcSqlQuery; + } + ++void internal_gmlc_mysql_database_views_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { ++ gchar * pcName = (gchar *) key; ++ GArray * arList = (GArray *) user_data; ++ UNUSED_VAR(value); ++ ++ g_array_append_val(arList, pcName); ++} ++ + GArray * gmlc_mysql_database_views_name_list(GmlcMysqlDatabase * pGmlcMysqlDb, gboolean bUpdateList) { + GArray * arList = NULL; + +- void internal_gmlc_mysql_database_views_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { +- gchar * pcName = (gchar *) key; +- GArray * arList = (GArray *) user_data; +- UNUSED_VAR(value); +- +- g_array_append_val(arList, pcName); +- } +- + if (bUpdateList) { + gmlc_mysql_database_update_views_list(pGmlcMysqlDb); + } +@@ -396,17 +396,17 @@ gchar * gmlc_mysql_database_create_new_v + return pcSqlQuery; + } + ++void internal_gmlc_mysql_database_functions_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { ++ gchar * pcName = (gchar *) key; ++ GArray * arList = (GArray *) user_data; ++ UNUSED_VAR(value); ++ ++ g_array_append_val(arList, pcName); ++} ++ + GArray * gmlc_mysql_database_functions_name_list(GmlcMysqlDatabase * pGmlcMysqlDb, gboolean bUpdateList) { + GArray * arList = NULL; + +- void internal_gmlc_mysql_database_functions_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { +- gchar * pcName = (gchar *) key; +- GArray * arList = (GArray *) user_data; +- UNUSED_VAR(value); +- +- g_array_append_val(arList, pcName); +- } +- + if (bUpdateList) { + gmlc_mysql_database_update_functions_list(pGmlcMysqlDb); + } +@@ -499,18 +499,18 @@ gchar * gmlc_mysql_database_create_new_f + + return pcSqlQuery; + } ++ ++void internal_gmlc_mysql_database_procedures_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { ++ gchar * pcName = (gchar *) key; ++ GArray * arList = (GArray *) user_data; ++ UNUSED_VAR(value); ++ ++ g_array_append_val(arList, pcName); ++} + + GArray * gmlc_mysql_database_procedures_name_list(GmlcMysqlDatabase * pGmlcMysqlDb, gboolean bUpdateList) { + GArray * arList = NULL; + +- void internal_gmlc_mysql_database_procedures_name_list_append_name (gpointer key, gpointer value, gpointer user_data) { +- gchar * pcName = (gchar *) key; +- GArray * arList = (GArray *) user_data; +- UNUSED_VAR(value); +- +- g_array_append_val(arList, pcName); +- } +- + if (bUpdateList) { + gmlc_mysql_database_update_procedures_list(pGmlcMysqlDb); + } diff -Naur gmysqlcc.orig/gmysqlcc-0.3.0/debian/patches/series gmysqlcc/gmysqlcc-0.3.0/debian/patches/series --- gmysqlcc.orig/gmysqlcc-0.3.0/debian/patches/series 2014-06-02 16:02:08.465020340 -0500 +++ gmysqlcc/gmysqlcc-0.3.0/debian/patches/series 2014-06-02 16:02:41.101020908 -0500 @@ -1,2 +1,3 @@ no_encoding_at_desktop.patch dont_override_cflags.patch +clang-ftbfs.diff