Taken from upstream.

From 4c2369083c5941ffada100e4a7e4702e681585e3 Mon Sep 17 00:00:00 2001
From: taozuhong <taozuhong@gmail.com>
Date: Tue, 11 Jan 2022 15:03:28 +0800
Subject: [PATCH] fixed compile error

---
 libgda/Gda-6.0-custom.vala |  3 +++
 libgda/sql-parser/lemon.c  | 39 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/libgda/Gda-6.0-custom.vala b/libgda/Gda-6.0-custom.vala
index d046c5c24..4d1408648 100644
--- a/libgda/Gda-6.0-custom.vala
+++ b/libgda/Gda-6.0-custom.vala
@@ -92,7 +92,10 @@ namespace Gda {
 	[CCode (cheader_filename = "libgda.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gda_sql_statement_get_type ()")]
 	[Compact]
 	public class SqlStatement {
+		#if VALA_0_50
+		#else
 		public static Gda.SqlStatementContentsInfo get_contents_infos (Gda.SqlStatementType type);
+		#endif
 	}
 
 }
diff --git a/libgda/sql-parser/lemon.c b/libgda/sql-parser/lemon.c
index a6fe75bb9..a3c7</td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>refs</a><a class='active' href='/guix/log/gnu/packages/genimage.scm'>log</a><a href='/guix/tree/gnu/packages/genimage.scm?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>tree</a><a href='/guix/commit/gnu/packages/genimage.scm?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>commit</a><a href='/guix/diff/gnu/packages/genimage.scm?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/genimage.scm'>
<input type='hidden' name='id' value='9e44a6f77615fa95990412a7b1dc2ba8086a5124'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>root</a>/<a href='/guix/log/gnu?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>gnu</a>/<a href='/guix/log/gnu/packages?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>packages</a>/<a href='/guix/log/gnu/packages/genimage.scm?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124'>genimage.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/genimage.scm?id=9e44a6f77615fa95990412a7b1dc2ba8086a5124&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
uintptr_t *)(((uintptr_t)A)+offset))
 
 /*
 ** Inputs:
@@ -1594,13 +1594,13 @@ int main(G_GNUC_UNUSED int argc, char **argv)
 **   The "next" pointers for elements in the lists a and b are
 **   changed.
 */
-static char *merge(
-  char *a,
-  char *b,
-  int (*cmp)(const char*,const char*),
-  int offset
+static uintptr_t merge(
+  uintptr_t a,
+  uintptr_t b,
+  int (*cmp)(const uintptr_t, const uintptr_t),
+  uintptr_t offset
 ){
-  char *ptr, *head;
+  uintptr_t ptr, *head;
 
   if( a==0 ){
     head = b;
@@ -1646,16 +1646,15 @@ static char *merge(
 **   The "next" pointers for elements in list are changed.
 */
 #define LISTSIZE 30
-static char *msort(
-  char *list,
-  char **next,
-  int (*cmp)(const char*,const char*)
+static uintptr_t msort(
+  uintptr_t list,
+  uintptr_t *next,
+  int (*cmp)(const uintptr_t, const uintptr_t)
 ){
-  unsigned long offset;
-  char *ep;
-  char *set[LISTSIZE];
+  uintptr_t ep;
+  uintptr_t set[LISTSIZE];
   int i;
-  offset = (unsigned long)next - (unsigned long)list;
+  uintptr_t offset = (uintptr_t)next - (uintptr_t)list;
   for(i=0; i<LISTSIZE; i++) set[i] = 0;
   while( list ){
     ep = list;
-- 
GitLab