Skip to content

Commit 1a73104

Browse files
authored
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: apache/arrow#48617
1 parent 4be2c74 commit 1a73104

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

ci/linux-packages/apt/debian-bookworm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=debian:bookworm
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
RUN \
2424
echo "debconf debconf/frontend select Noninteractive" | \

ci/linux-packages/apt/debian-trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=debian:trixie
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
RUN \
2424
echo "debconf debconf/frontend select Noninteractive" | \

ci/linux-packages/apt/ubuntu-jammy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=ubuntu:jammy
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
RUN \
2424
echo "debconf debconf/frontend select Noninteractive" | \

ci/linux-packages/apt/ubuntu-noble/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=ubuntu:noble
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
RUN \
2424
echo "debconf debconf/frontend select Noninteractive" | \

ci/linux-packages/yum/almalinux-10/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=almalinux:10
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
ARG DEBUG
2424

ci/linux-packages/yum/almalinux-8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=almalinux:8
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
ARG DEBUG
2424

ci/linux-packages/yum/almalinux-9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG FROM=almalinux:9
1919
FROM ${FROM}
2020

21-
ENV IMAGE_VERSION=2025-10-31
21+
ENV IMAGE_VERSION=2026-01-27
2222

2323
ARG DEBUG
2424

glib/adbc-arrow-glib/meson.build

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ pkgconfig.generate(
8282
version: meson.project_version(),
8383
)
8484

85+
if arrow_glib.version().version_compare('>=23.0.0')
86+
components = arrow_glib.version().split('.')
87+
major = components[0]
88+
minor = components[1]
89+
arrow_glib_gir_api_version = f'@major@.@minor@'
90+
else
91+
arrow_glib_gir_api_version = '1.0'
92+
endif
8593
adbc_arrow_glib_gir = \
8694
gnome.generate_gir(
8795
libadbc_arrow_glib,
@@ -91,7 +99,7 @@ adbc_arrow_glib_gir = \
9199
fatal_warnings: gi_fatal_warnings,
92100
header: 'adbc-arrow-glib/adbc-arrow-glib.h',
93101
identifier_prefix: 'GADBCArrow',
94-
includes: ['ADBC-1.0', 'Arrow-1.0'],
102+
includes: ['ADBC-1.0', f'Arrow-@arrow_glib_gir_api_version@'],
95103
install: true,
96104
namespace: 'ADBCArrow',
97105
nsversion: api_version,

0 commit comments

Comments
 (0)