[packages/libgda5] More fixes (firebird and mbd are incompatible with current APIs + few cast fixes)
arekm
arekm at pld-linux.org
Sat Jul 19 22:59:57 CEST 2025
commit 5da934ac2bec0cf357ec46626c1e486e73bb449f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Jul 19 22:59:52 2025 +0200
More fixes (firebird and mbd are incompatible with current APIs + few cast fixes)
build.patch | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
libgda5.spec | 9 ++++--
2 files changed, 95 insertions(+), 3 deletions(-)
---
diff --git a/libgda5.spec b/libgda5.spec
index 39bb1cb..7c1ede9 100644
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -6,10 +6,10 @@
%bcond_without vala # Vala APIs and GdaData C library
# - database plugins:
%bcond_without dbsql # BerkeleyDB SQL plugin
-%bcond_without firebird # Firebird plugins
+%bcond_with firebird # Firebird plugins
%bcond_without jdbc # JDBC plugin
%bcond_without ldap # LDAP plugin
-%bcond_without mdb # MDB plugin
+%bcond_with mdb # MDB plugin
%bcond_without mysql # MySQL plugin
%bcond_with oci # Oracle DB plugin
%bcond_without pgsql # PostgreSQL plugin
@@ -22,7 +22,7 @@ Summary: GNU Data Access library
Summary(pl.UTF-8): Biblioteka GNU Data Access
Name: libgda5
Version: 5.2.10
-Release: 6
+Release: 7
License: LGPL v2+/GPL v2+
Group: Libraries
Source0: https://download.gnome.org/sources/libgda/5.2/libgda-%{version}.tar.xz
@@ -36,6 +36,7 @@ Patch5: java-arch.patch
Patch6: java8.patch
Patch7: libgda-mdb1.0.patch
Patch8: %{name}-sqlite.patch
+Patch9: build.patch
URL: https://www.gnome-db.org/
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.68
@@ -401,6 +402,7 @@ Plik katalogu oraz ikony libgda dla Glade.
%patch -P6 -p1
%patch -P7 -p1
%patch -P8 -p1
+%patch -P9 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
libgda-report/RML/trml2html/trml2html.py \
@@ -418,6 +420,7 @@ export _JAVA_SUFFIX="/lib/i386/server"
export _JAVA_SUFFIX="/lib/amd64/server"
%endif
%endif
+%{__autopoint}
%{__gtkdocize}
%{__intltoolize}
%{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..0e28171
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,89 @@
+--- libgda-5.2.10/libgda/gda-connection.c~ 2020-11-08 21:23:19.000000000 +0100
++++ libgda-5.2.10/libgda/gda-connection.c 2025-07-19 22:23:01.055909286 +0200
+@@ -6458,7 +6458,7 @@ gda_connection_add_prepared_statement (G
+
+ 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);
+--- libgda-5.2.10/libgda-xslt/sql_backend.c~ 2020-11-08 21:23:19.000000000 +0100
++++ libgda-5.2.10/libgda-xslt/sql_backend.c 2025-07-19 22:45:11.527776318 +0200
+@@ -152,7 +152,7 @@ _gda_xslt_bk_section (GdaXsltExCont * ex
+ if (info != NULL) {
+ xsltCallTemplate
+ (ctxt, node,
+- cur_node, info);
++ cur_node, (xsltElemPreCompPtr)info);
+ }
+ else {
+ printf ("the xsltStylePreCompPtr is empthy\n");
+--- libgda-5.2.10/libgda-ui/data-entries/gdaui-entry-bin.c~ 2020-11-08 21:23:19.000000000 +0100
++++ libgda-5.2.10/libgda-ui/data-entries/gdaui-entry-bin.c 2025-07-19 22:48:05.858896256 +0200
+@@ -239,11 +239,11 @@
+
+ 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);
+--- libgda-5.2.10/libgda-ui/gdaui-raw-form.c~ 2020-11-08 21:23:19.000000000 +0100
++++ libgda-5.2.10/libgda-ui/gdaui-raw-form.c 2025-07-19 22:53:11.354191646 +0200
+@@ -383,7 +383,7 @@
+ 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);
+--- libgda-5.2.10/libgda-ui/gdaui-raw-grid.c~ 2020-11-08 21:23:19.000000000 +0100
++++ libgda-5.2.10/libgda-ui/gdaui-raw-grid.c 2025-07-19 22:55:18.908344177 +0200
+@@ -2915,7 +2915,7 @@ paramlist_param_attr_changed_cb (G_GNUC_
+ 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);
+--- libgda-5.2.10/libgda-ui/gdaui-raw-grid.c~ 2025-07-19 22:55:18.000000000 +0200
++++ libgda-5.2.10/libgda-ui/gdaui-raw-grid.c 2025-07-19 22:57:53.676004196 +0200
+@@ -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 = (GdaDataProxy *)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 = (GdaDataProxy *)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 = (GdaDataProxy *)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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/5da934ac2bec0cf357ec46626c1e486e73bb449f
More information about the pld-cvs-commit
mailing list