This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 1a73104a3 build(glib): add support for Apache Arrow GLib 23.0.0 or 
later (#3909)
1a73104a3 is described below

commit 1a73104a338b73ae8705e4816cfdc48af1fd2ebf
Author: David Li <[email protected]>
AuthorDate: Tue Jan 27 23:03:06 2026 +0900

    build(glib): add support for Apache Arrow GLib 23.0.0 or later (#3909)
    
    Apache Arrow GLib 23.0.0 or later change GIR API version to
    `${MAJOR}.${MINOR}` from `1.0`. See also:
    https://github.com/apache/arrow/pull/48617
---
 ci/linux-packages/apt/debian-bookworm/Dockerfile |  2 +-
 ci/linux-packages/apt/debian-trixie/Dockerfile   |  2 +-
 ci/linux-packages/apt/ubuntu-jammy/Dockerfile    |  2 +-
 ci/linux-packages/apt/ubuntu-noble/Dockerfile    |  2 +-
 ci/linux-packages/yum/almalinux-10/Dockerfile    |  2 +-
 ci/linux-packages/yum/almalinux-8/Dockerfile     |  2 +-
 ci/linux-packages/yum/almalinux-9/Dockerfile     |  2 +-
 glib/adbc-arrow-glib/meson.build                 | 10 +++++++++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ci/linux-packages/apt/debian-bookworm/Dockerfile 
b/ci/linux-packages/apt/debian-bookworm/Dockerfile
index f675c09f4..b759178a2 100644
--- a/ci/linux-packages/apt/debian-bookworm/Dockerfile
+++ b/ci/linux-packages/apt/debian-bookworm/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=debian:bookworm
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 RUN \
   echo "debconf debconf/frontend select Noninteractive" | \
diff --git a/ci/linux-packages/apt/debian-trixie/Dockerfile 
b/ci/linux-packages/apt/debian-trixie/Dockerfile
index 33561c426..8269f72a5 100644
--- a/ci/linux-packages/apt/debian-trixie/Dockerfile
+++ b/ci/linux-packages/apt/debian-trixie/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=debian:trixie
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 RUN \
   echo "debconf debconf/frontend select Noninteractive" | \
diff --git a/ci/linux-packages/apt/ubuntu-jammy/Dockerfile 
b/ci/linux-packages/apt/ubuntu-jammy/Dockerfile
index 1cbee5381..e750c2f78 100644
--- a/ci/linux-packages/apt/ubuntu-jammy/Dockerfile
+++ b/ci/linux-packages/apt/ubuntu-jammy/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=ubuntu:jammy
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 RUN \
   echo "debconf debconf/frontend select Noninteractive" | \
diff --git a/ci/linux-packages/apt/ubuntu-noble/Dockerfile 
b/ci/linux-packages/apt/ubuntu-noble/Dockerfile
index f958555a8..182ba2ba6 100644
--- a/ci/linux-packages/apt/ubuntu-noble/Dockerfile
+++ b/ci/linux-packages/apt/ubuntu-noble/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=ubuntu:noble
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 RUN \
   echo "debconf debconf/frontend select Noninteractive" | \
diff --git a/ci/linux-packages/yum/almalinux-10/Dockerfile 
b/ci/linux-packages/yum/almalinux-10/Dockerfile
index 0b8dab1cb..170242dfd 100644
--- a/ci/linux-packages/yum/almalinux-10/Dockerfile
+++ b/ci/linux-packages/yum/almalinux-10/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=almalinux:10
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 ARG DEBUG
 
diff --git a/ci/linux-packages/yum/almalinux-8/Dockerfile 
b/ci/linux-packages/yum/almalinux-8/Dockerfile
index c34a24b49..4cbd00490 100644
--- a/ci/linux-packages/yum/almalinux-8/Dockerfile
+++ b/ci/linux-packages/yum/almalinux-8/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=almalinux:8
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 ARG DEBUG
 
diff --git a/ci/linux-packages/yum/almalinux-9/Dockerfile 
b/ci/linux-packages/yum/almalinux-9/Dockerfile
index e602343b8..20445deb6 100644
--- a/ci/linux-packages/yum/almalinux-9/Dockerfile
+++ b/ci/linux-packages/yum/almalinux-9/Dockerfile
@@ -18,7 +18,7 @@
 ARG FROM=almalinux:9
 FROM ${FROM}
 
-ENV IMAGE_VERSION=2025-10-31
+ENV IMAGE_VERSION=2026-01-27
 
 ARG DEBUG
 
diff --git a/glib/adbc-arrow-glib/meson.build b/glib/adbc-arrow-glib/meson.build
index 732e27033..dfbfd6bf0 100644
--- a/glib/adbc-arrow-glib/meson.build
+++ b/glib/adbc-arrow-glib/meson.build
@@ -82,6 +82,14 @@ pkgconfig.generate(
     version: meson.project_version(),
 )
 
+if arrow_glib.version().version_compare('>=23.0.0')
+    components = arrow_glib.version().split('.')
+    major = components[0]
+    minor = components[1]
+    arrow_glib_gir_api_version = f'@major@.@minor@'
+else
+    arrow_glib_gir_api_version = '1.0'
+endif
 adbc_arrow_glib_gir = \
     gnome.generate_gir(
     libadbc_arrow_glib,
@@ -91,7 +99,7 @@ adbc_arrow_glib_gir = \
     fatal_warnings: gi_fatal_warnings,
     header: 'adbc-arrow-glib/adbc-arrow-glib.h',
     identifier_prefix: 'GADBCArrow',
-    includes: ['ADBC-1.0', 'Arrow-1.0'],
+    includes: ['ADBC-1.0', f'Arrow-@arrow_glib_gir_api_version@'],
     install: true,
     namespace: 'ADBCArrow',
     nsversion: api_version,

Reply via email to