FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

databases/libgda5*: multiple fixes (+)

Browse Source 
fix build with MySQL 8.4+
fix libgda-xlst API change
fix error with redefine bool

Obtaned from:	Gentoo
This commit is contained in:
Dima Panov
2026-04-09 21:52:35 +03:00
parent fcf59f4d3a
commit 7616a31774
19 changed files with 389 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
databases/libgda5-mysql/Makefile
+1 -2
View File
@@ -1,4 +1,4 @@
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-mysql
@@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../libgda5
BUILD_WRKSRC= ${WRKSRC}/providers/mysql/
INSTALL_WRKSRC= ${BUILD_WRKSRC}
PLIST= ${.CURDIR}/pkg-plist
MYSQL_VARS= IGNORE_WITH_MYSQL="84"
LIBGDA5_SLAVE= mysql
.include "${MASTERDIR}/Makefile"
databases/libgda5/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PORTNAME= libgda
DISTVERSION?= 5.2.10
PORTREVISION= 6
PORTREVISION?= 7
CATEGORIES= databases gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= 5
databases/libgda5/files/patch-libgda-ui_data-entries_gdaui-entry-bin.c
+16
View File
@@ -0,0 +1,16 @@
--- libgda-ui/data-entries/gdaui-entry-bin.c.orig 2020-11-08 20:23:19 UTC
+++ libgda-ui/data-entries/gdaui-entry-bin.c
@@ -239,11 +239,11 @@ create_entry (GdauiEntryWrapper *mgwrap)
label = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- dbin->priv->button_label = g_object_ref (G_OBJECT (label));
+ dbin->priv->button_label = (GtkWidget *) g_object_ref (G_OBJECT (label));
img = gtk_image_new_from_pixbuf (attach_pixbuf);
gtk_box_pack_start (GTK_BOX (hbox), img, FALSE, FALSE, 0);
- dbin->priv->button_image = g_object_ref (G_OBJECT (img));
+ dbin->priv->button_image = (GtkWidget *) g_object_ref (G_OBJECT (img));
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_misc_set_alignment (GTK_MISC (arrow), 1.0, -1);
databases/libgda5/files/patch-libgda-ui_data-entries_plugins_libmain.c
+10
View File
@@ -0,0 +1,10 @@
--- libgda-ui/data-entries/plugins/libmain.c.orig 2020-11-08 20:23:19 UTC
+++ libgda-ui/data-entries/plugins/libmain.c
@@ -44,6 +44,7 @@
#endif
#include <gtksourceview/gtksourceview.h>
+ #include <gtksourceview/gtksourcelanguage.h>
#include <gtksourceview/gtksourcelanguagemanager.h>
#include <gtksourceview/gtksourcebuffer.h>
#include <gtksourceview/gtksourcestyleschememanager.h>
databases/libgda5/files/patch-libgda-ui_gdaui-raw-form.c
+11
View File
@@ -0,0 +1,11 @@
--- libgda-ui/gdaui-raw-form.c.orig 2020-11-08 20:23:19 UTC
+++ libgda-ui/gdaui-raw-form.c
@@ -383,7 +383,7 @@ gdaui_raw_form_set_property (GObject *object,
if (!form->priv->proxy) {
/* first time setting */
if (GDA_IS_DATA_PROXY (model))
- form->priv->proxy = g_object_ref (G_OBJECT (model));
+ form->priv->proxy = (GdaDataProxy *) g_object_ref (G_OBJECT (model));
else
form->priv->proxy = GDA_DATA_PROXY (gda_data_proxy_new (model));
form->priv->data_model = gda_data_proxy_get_proxied_model (form->priv->proxy);
databases/libgda5/files/patch-libgda-ui_gdaui-raw-grid.c
+47
View File
@@ -0,0 +1,47 @@
--- libgda-ui/gdaui-raw-grid.c.orig 2020-11-08 20:23:19 UTC
+++ libgda-ui/gdaui-raw-grid.c
@@ -517,7 +517,7 @@ gdaui_raw_grid_set_property (GObject *object,
if (!grid->priv->proxy) {
/* first time setting */
if (GDA_IS_DATA_PROXY (model))
- grid->priv->proxy = g_object_ref (G_OBJECT (model));
+ grid->priv->proxy = (GdaDataProxy *) g_object_ref (G_OBJECT (model));
else
grid->priv->proxy = GDA_DATA_PROXY (gda_data_proxy_new (model));
@@ -787,7 +787,7 @@ create_columns_data (GdauiRawGrid *grid)
/* FIXME: if nullok is FALSE, then set the column title in bold */
cdata->tooltip_text = g_strdup (_("Can't be NULL"));
renderer = gdaui_data_cell_renderer_combo_new (grid->priv->iter_info, gdaui_set_group_get_source (group));
- cdata->data_cell = g_object_ref_sink ((GObject*) renderer);
+ cdata->data_cell = (GtkCellRenderer *) g_object_ref_sink ((GObject*) renderer);
g_hash_table_insert (grid->priv->columns_hash, renderer, cdata);
g_free (cdata->title);
cdata->title = title;
@@ -827,7 +827,7 @@ create_columns_data (GdauiRawGrid *grid)
GDAUI_ATTRIBUTE_PLUGIN);
}
renderer = _gdaui_new_cell_renderer (g_type, plugin);
- cdata->data_cell = g_object_ref_sink ((GObject*) renderer);
+ cdata->data_cell = (GtkCellRenderer *) g_object_ref_sink ((GObject*) renderer);
g_hash_table_insert (grid->priv->columns_hash, renderer, cdata);
g_free (cdata->title);
cdata->title = title;
@@ -849,7 +849,7 @@ create_columns_data (GdauiRawGrid *grid)
/* Adding the GValue's information cell as another GtkCellRenderer */
renderer = gdaui_data_cell_renderer_info_new (grid->priv->store, grid->priv->iter, group);
- cdata->info_cell = g_object_ref_sink ((GObject*) renderer);
+ cdata->info_cell = (GtkCellRenderer *) g_object_ref_sink ((GObject*) renderer);
g_hash_table_insert (grid->priv->columns_hash, renderer, cdata);
g_signal_connect (G_OBJECT (renderer), "status-changed",
G_CALLBACK (data_cell_status_changed), grid);
@@ -2915,7 +2915,7 @@ paramlist_param_attr_changed_cb (G_GNUC_UNUSED GdaSet
GtkCellRenderer *renderer;
gint model_col;
renderer = _gdaui_new_cell_renderer (gda_holder_get_g_type (param), plugin);
- cdata->data_cell = g_object_ref_sink ((GObject*) renderer);
+ cdata->data_cell = (GtkCellRenderer *) g_object_ref_sink ((GObject*) renderer);
g_hash_table_insert (grid->priv->columns_hash, renderer, cdata);
model_col = g_slist_index (((GdaSet *)grid->priv->iter)->holders, param);
databases/libgda5/files/patch-libgda-xslt_sql__backend.c
+13
View File
@@ -0,0 +1,13 @@
--- libgda-xslt/sql_backend.c.orig 2020-11-08 20:23:19 UTC
+++ libgda-xslt/sql_backend.c
@@ -146,8 +146,8 @@ _gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltInt
cur_node = cur_node->next) {
if (IS_XSLT_ELEM (cur_node)) {
if (IS_XSLT_NAME (cur_node, "call-template")) {
- xsltStylePreCompPtr info =
- (xsltStylePreCompPtr)
+ xsltElemPreCompPtr info =
+ (xsltElemPreCompPtr)
cur_node->psvi;
if (info != NULL) {
xsltCallTemplate
databases/libgda5/files/patch-libgda_gda-connection.c
+11
View File
@@ -0,0 +1,11 @@
--- libgda/gda-connection.c.orig 2020-11-08 20:23:19 UTC
+++ libgda/gda-connection.c
@@ -6458,7 +6458,7 @@ gda_connection_add_prepared_statement (GdaConnection *
if (!cnc->priv->prepared_stmts)
cnc->priv->prepared_stmts = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL, _gda_prepared_estatement_free);
+ NULL, (GDestroyNotify) _gda_prepared_estatement_free);
g_hash_table_remove (cnc->priv->prepared_stmts, gda_stmt);
PreparedStatementRef *ref = _gda_prepared_estatement_new (gda_stmt, prepared_stmt);
g_hash_table_insert (cnc->priv->prepared_stmts, gda_stmt, ref);
databases/libgda5/files/patch-libgda_sql-parser_lemon.c
+17
View File
@@ -0,0 +1,17 @@
--- libgda/sql-parser/lemon.c.orig 2020-11-08 20:23:20 UTC
+++ libgda/sql-parser/lemon.c
@@ -69,14 +69,6 @@ static struct action *Action_sort(struct action *);
static struct action *Action_new(void);
static struct action *Action_sort(struct action *);
-/********** From the file "build.h" ************************************/
-void FindRulePrecedences();
-void FindFirstSets();
-void FindStates();
-void FindLinks();
-void FindFollowSets();
-void FindActions();
-
/********* From the file "configlist.h" *********************************/
void Configlist_init(void);
struct config *Configlist_add(struct rule *, int);
databases/libgda5/files/patch-libgda_sqlite_virtual_gda-vconnection-data-model.c
+11
View File
@@ -0,0 +1,11 @@
--- libgda/sqlite/virtual/gda-vconnection-data-model.c.orig 2020-11-08 20:23:20 UTC
+++ libgda/sqlite/virtual/gda-vconnection-data-model.c
@@ -632,7 +632,7 @@ _gda_vconnection_set_working_obj (GdaVconnectionDataMo
VContext *vc = NULL;
g_assert (!td->context.current_vcontext);
- td->context.mutex = &(cnc->priv->lock_context);
+ td->context.mutex = (GMutex *) &(cnc->priv->lock_context);
if (! td->context.hash)
td->context.hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL, (GDestroyNotify) vcontext_free);
databases/libgda5/files/patch-providers_mysql_gda-mysql-provider.c
+101
View File
@@ -0,0 +1,101 @@
--- providers/mysql/gda-mysql-provider.c.orig 2020-11-08 20:23:20 UTC
+++ providers/mysql/gda-mysql-provider.c
@@ -1838,7 +1838,7 @@ real_prepare (GdaServerProvider *provider, GdaConnecti
return FALSE;
}
- my_bool update_max_length = 1;
+ _Bool update_max_length = 1;
if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
_gda_mysql_make_error (cnc, NULL, mysql_stmt, error);
mysql_stmt_close (mysql_stmt);
@@ -1944,7 +1944,7 @@ prepare_stmt_simple (MysqlConnectionData *cdata,
return FALSE;
}
- my_bool update_max_length = 1;
+ _Bool update_max_length = 1;
if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
_gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error);
mysql_stmt_close (mysql_stmt);
@@ -2330,7 +2330,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
if (allow_noparam) {
/* bind param to NULL */
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
empty_rs = TRUE;
continue;
}
@@ -2350,7 +2350,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
if (allow_noparam) {
/* bind param to NULL */
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
empty_rs = TRUE;
continue;
}
@@ -2402,7 +2402,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
GdaStatement *rstmt;
if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else if (!rstmt)
return NULL;
@@ -2462,7 +2462,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
ts = (GdaTimestamp*) gda_value_get_timestamp (value);
if (!ts) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
gboolean tofree = FALSE;
@@ -2498,7 +2498,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
ts = (GdaTime*) gda_value_get_time (value);
if (!ts) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
gboolean tofree = FALSE;
@@ -2531,7 +2531,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
ts = (GDate*) g_value_get_boxed (value);
if (!ts) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
MYSQL_TIME *mtime;
@@ -2551,7 +2551,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
str = g_value_get_string (value);
if (!str) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING;
@@ -2627,7 +2627,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
bin = ((GdaBinary*) blob);
if (!bin) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
gchar *str = NULL;
@@ -2668,7 +2668,7 @@ gda_mysql_provider_statement_execute (GdaServerProvide
bin = gda_value_get_binary (value);
if (!bin) {
mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
- mysql_bind_param[i].is_null = (my_bool*)1;
+ mysql_bind_param[i].is_null = (_Bool *) 1;
}
else {
mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
databases/libgda5/files/patch-providers_mysql_gda-mysql-recordset.c
+33
View File
@@ -0,0 +1,33 @@
--- providers/mysql/gda-mysql-recordset.c.orig 2020-11-08 20:23:20 UTC
+++ providers/mysql/gda-mysql-recordset.c
@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection *cnc
/* binding results with types */
mysql_bind_result[i].buffer_type = field->type;
mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE;
- mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool));
+ mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool));
switch (mysql_bind_result[i].buffer_type) {
case MYSQL_TYPE_TINY:
@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_
gint col;
for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) {
- my_bool truncated;
+ _Bool truncated;
mysql_bind_result[col].error = &truncated;
mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]),
(unsigned int)col, 0);
@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_
/*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/
- my_bool is_null = FALSE;
+ _Bool is_null = FALSE;
unsigned long length;
- memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool));
+ memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool));
if (is_null) {
gda_value_set_null (value);
continue;
databases/libgda5/files/patch-tools_browser_browser-virtual-connection.c
+20
View File
@@ -0,0 +1,20 @@
--- tools/browser/browser-virtual-connection.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/browser-virtual-connection.c
@@ -489,7 +489,7 @@ browser_virtual_connection_part_copy (const BrowserVir
if (spm->table_name)
npm->table_name = g_strdup (spm->table_name);
if (spm->model)
- npm->model = g_object_ref (G_OBJECT (spm->model));
+ npm->model = (GdaDataModel *) g_object_ref (G_OBJECT (spm->model));
break;
}
case BROWSER_VIRTUAL_CONNECTION_PART_CNC: {
@@ -500,7 +500,7 @@ browser_virtual_connection_part_copy (const BrowserVir
if (scnc->table_schema)
ncnc->table_schema = g_strdup (scnc->table_schema);
if (scnc->source_cnc)
- ncnc->source_cnc = g_object_ref (G_OBJECT (scnc->source_cnc));
+ ncnc->source_cnc = (BrowserConnection *) g_object_ref (G_OBJECT (scnc->source_cnc));
break;
}
default:
databases/libgda5/files/patch-tools_browser_canvas_browser-canvas-text.c
+37
View File
@@ -0,0 +1,37 @@
--- tools/browser/canvas/browser-canvas-text.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/canvas/browser-canvas-text.c
@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObject *object,
const gchar *cstr = NULL;
gchar *str;
gdouble size = 0;
- gboolean bool = FALSE;
+ gboolean bool_var = FALSE;
ct = BROWSER_CANVAS_TEXT (object);
@@ -269,11 +269,11 @@ browser_canvas_text_set_property (GObject *object,
ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR);
break;
case PROP_UNDERLINE:
- bool = g_value_get_boolean (value);
- ct->priv->underline = bool;
+ bool_var = g_value_get_boolean (value);
+ ct->priv->underline = bool_var;
adjust_text_pango_attributes (ct);
if (ct->priv->text_item) {
- if (bool) {
+ if (bool_var) {
str = g_strdup_printf ("<u>%s</u>", ct->priv->text);
g_object_set (G_OBJECT (ct->priv->text_item),
"text", str,
@@ -286,8 +286,8 @@ browser_canvas_text_set_property (GObject *object,
"use-markup", FALSE, NULL);
}
case PROP_BOLD:
- bool = g_value_get_boolean (value);
- ct->priv->bold = bool;
+ bool_var = g_value_get_boolean (value);
+ ct->priv->bold = bool_var;
adjust_text_pango_attributes (ct);
break;
default:
databases/libgda5/files/patch-tools_browser_canvas_browser-canvas.c
+11
View File
@@ -0,0 +1,11 @@
--- tools/browser/canvas/browser-canvas.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/canvas/browser-canvas.c
@@ -853,7 +853,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *can
#ifdef GRAPHVIZ_NEW_API
graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
- agnode (graph, "shape", "box");
+ agnode (graph, "shape", 1);
agset (graph, "height", ".1");
agset (graph, "width", ".1");
agset (graph, "fixedsize", "true");
databases/libgda5/files/patch-tools_browser_common_fk-declare.c
+11
View File
@@ -0,0 +1,11 @@
--- tools/browser/common/fk-declare.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/common/fk-declare.c
@@ -403,7 +403,7 @@ fk_declare_new (GtkWindow *parent, GdaMetaStruct *mstr
g_free (str);
decl = FK_DECLARE (wid);
- decl->priv->mstruct = g_object_ref ((GObject*) mstruct);
+ decl->priv->mstruct = (GdaMetaStruct *) g_object_ref ((GObject*) mstruct);
decl->priv->mtable = table;
create_internal_layout (decl);
databases/libgda5/files/patch-tools_browser_common_ui-formgrid.c
+16
View File
@@ -0,0 +1,16 @@
--- tools/browser/common/ui-formgrid.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/common/ui-formgrid.c
@@ -754,11 +754,11 @@ statement_executed_cb (G_GNUC_UNUSED BrowserConnection
ui_formgrid_handle_user_prefs (UI_FORMGRID (fg), NULL, stmt);
g_object_unref (stmt);
}
- aed->model = g_object_ref (out_result);
+ aed->model = (GdaDataModel *) g_object_ref (out_result);
g_signal_connect (aed->params, "holder-changed",
G_CALLBACK (action_executed_holder_changed_cb), aed);
- aed->formgrid = g_object_ref (fg);
+ aed->formgrid = (UiFormGrid *) g_object_ref (fg);
aed->formgrid->priv->autoupdate_possible = TRUE;
gtk_widget_show (aed->formgrid->priv->autoupdate_toggle);
}
databases/libgda5/files/patch-tools_browser_connection-binding-properties.c
+11
View File
@@ -0,0 +1,11 @@
--- tools/browser/connection-binding-properties.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/connection-binding-properties.c
@@ -147,7 +147,7 @@ connection_binding_properties_new_create (BrowserConne
part = g_new0 (BrowserVirtualConnectionPart, 1);
part->part_type = BROWSER_VIRTUAL_CONNECTION_PART_CNC;
part->u.cnc.table_schema = g_strdup (browser_connection_get_name (bcnc));
- part->u.cnc.source_cnc = g_object_ref (G_OBJECT (bcnc));
+ part->u.cnc.source_cnc = (BrowserConnection *) g_object_ref (G_OBJECT (bcnc));
specs->parts = g_slist_append (NULL, part);
cprop = CONNECTION_BINDING_PROPERTIES (g_object_new (CONNECTION_TYPE_BINDING_PROPERTIES, NULL));
databases/libgda5/files/patch-tools_browser_schema-browser_table-info.c
+11
View File
@@ -0,0 +1,11 @@
--- tools/browser/schema-browser/table-info.c.orig 2020-11-08 20:23:20 UTC
+++ tools/browser/schema-browser/table-info.c
@@ -621,7 +621,7 @@ fk_bind_select_executed_cb (G_GNUC_UNUSED BrowserConne
}
}
}
- fkdata->model = g_object_ref (out_result);
+ fkdata->model = (GdaDataModel *) g_object_ref (out_result);
fkdata->model_rerunning = FALSE;
}