GH-48616: [GLib] Use Arrow-${MAJOR}.${MINOR}.typelib not Arrow-1.0.typelib (#48617)

kou · web-flow · commit 9c4faee97b88 · 2025-12-23T10:17:41.000+09:00
### Rationale for this change Our deb/RPM GLib library packages include version information such as `libarrow2300-glib.deb` and `arrow2300-glib-libs.rpm`. It's for installing multiple versions in the same system. But all version library packages include `Arrow-1.0.typelib`. If we install multiple GLib library package versions in the same system, `Arrow-1.0.typelib` is conflicted. If we use `Arrow-${MAJOR}.${MINOR}.typelib` not `Arrow-1.0.typelib`, we can really install multiple GLib library package versions in the same system. ### What changes are included in this PR? * Use `XXX-${MAJOR}.${MINOR}.{gir,typelib}` not `XXX-1.0.{gir,typelib}` * Update release script to substitute versions automatically ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #48616 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
diff --git a/.editorconfig b/.editorconfig
@@ -42,6 +42,10 @@ indent_style = space
 indent_size = 2
 indent_style = space
 
+[{meson.build,meson_options.txt}]
+indent_size = 4
+indent_style = space
+
 [*.cs]
 indent_size = 4
 indent_style = space
diff --git a/c_glib/arrow-cuda-glib/meson.build b/c_glib/arrow-cuda-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -77,7 +75,7 @@ endif
 if have_gi
     gir_dependencies = [declare_dependency(sources: arrow_glib_gir)]
     gir_extra_args = gir_scanner_extra_args + [
-        '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+        '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(gi_api_version),
     ]
     arrow_cuda_glib_gir = gnome.generate_gir(
         libarrow_cuda_glib,
@@ -86,7 +84,7 @@ if have_gi
         extra_args: gir_extra_args,
         header: 'arrow-cuda-glib/arrow-cuda-glib.h',
         identifier_prefix: 'GArrowCUDA',
-        includes: ['Arrow-1.0'],
+        includes: ['Arrow-@0@'.format(gi_api_version)],
         kwargs: generate_gi_common_args,
         namespace: 'ArrowCUDA',
         sources: sources + c_headers,
diff --git a/c_glib/arrow-dataset-glib/meson.build b/c_glib/arrow-dataset-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -120,11 +118,13 @@ if have_gi
         dependencies: declare_dependency(sources: arrow_glib_gir),
         export_packages: 'arrow-dataset-glib',
         extra_args: gir_scanner_extra_args + [
-            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+            '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(
+                gi_api_version,
+            ),
         ],
         header: 'arrow-dataset-glib/arrow-dataset-glib.h',
         identifier_prefix: 'GADataset',
-        includes: ['Arrow-1.0'],
+        includes: ['Arrow-@0@'.format(gi_api_version)],
         kwargs: generate_gi_common_args,
         namespace: 'ArrowDataset',
         sources: sources + c_headers + enums,
diff --git a/c_glib/arrow-flight-glib/meson.build b/c_glib/arrow-flight-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -84,11 +82,13 @@ if have_gi
         dependencies: declare_dependency(sources: arrow_glib_gir),
         export_packages: 'arrow-flight-glib',
         extra_args: gir_scanner_extra_args + [
-            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+            '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(
+                gi_api_version,
+            ),
         ],
         header: 'arrow-flight-glib/arrow-flight-glib.h',
         identifier_prefix: 'GAFlight',
-        includes: ['Arrow-1.0'],
+        includes: ['Arrow-@0@'.format(gi_api_version)],
         kwargs: generate_gi_common_args,
         namespace: 'ArrowFlight',
         sources: sources + c_headers,
diff --git a/c_glib/arrow-flight-sql-glib/meson.build b/c_glib/arrow-flight-sql-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -82,12 +80,19 @@ if have_gi
         dependencies: arrow_flight_sql_glib_gir_dependencies,
         export_packages: 'arrow-flight-sql-glib',
         extra_args: gir_scanner_extra_args + [
-            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
-            '--include-uninstalled=./arrow-flight-glib/ArrowFlight-1.0.gir',
+            '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(
+                gi_api_version,
+            ),
+            '--include-uninstalled=arrow-flight-glib/ArrowFlight-@0@.gir'.format(
+                gi_api_version,
+            ),
         ],
         header: 'arrow-flight-sql-glib/arrow-flight-sql-glib.h',
         identifier_prefix: 'GAFlightSQL',
-        includes: ['Arrow-1.0', 'ArrowFlight-1.0'],
+        includes: [
+            'Arrow-@0@'.format(gi_api_version),
+            'ArrowFlight-@0@'.format(gi_api_version),
+        ],
         kwargs: generate_gi_common_args,
         namespace: 'ArrowFlightSQL',
         sources: sources + c_headers,
diff --git a/c_glib/arrow-glib/Arrow.metadata b/c_glib/arrow-glib/Arrow.metadata
diff --git a/c_glib/arrow-glib/meson.build b/c_glib/arrow-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -280,6 +278,11 @@ if have_gi
     )
 
     if generate_vapi
+        configure_file(
+            copy: true,
+            input: 'Arrow.metadata',
+            output: 'Arrow-@0@.metadata'.format(gi_api_version),
+        )
         arrow_glib_vapi = gnome.generate_vapi(
             'arrow-glib',
             install: true,
diff --git a/c_glib/doc/meson.build b/c_glib/doc/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/c_glib/example/lua/meson.build b/c_glib/example/lua/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/c_glib/example/meson.build b/c_glib/example/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/c_glib/example/vala/meson.build b/c_glib/example/vala/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/c_glib/gandiva-glib/meson.build b/c_glib/gandiva-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -124,11 +122,13 @@ if have_gi
         dependencies: declare_dependency(sources: arrow_glib_gir),
         export_packages: 'gandiva-glib',
         extra_args: gir_scanner_extra_args + [
-            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+            '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(
+                gi_api_version,
+            ),
         ],
         header: 'gandiva-glib/gandiva-glib.h',
         identifier_prefix: 'GGandiva',
-        includes: ['Arrow-1.0'],
+        includes: ['Arrow-@0@'.format(gi_api_version)],
         kwargs: generate_gi_common_args,
         namespace: 'Gandiva',
         sources: sources + c_headers + enums,
diff --git a/c_glib/meson.build b/c_glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -50,7 +48,7 @@ version_minor = version_numbers[1].to_int()
 version_micro = version_numbers[2].to_int()
 version_no_snapshot = '.'.join(version_numbers)
 
-api_version = '1.0'
+gi_api_version = '@0@.@1@'.format(version_major, version_minor)
 so_version = version_major * 100 + version_minor
 so_version_patch = version_micro
 library_version = '@0@.@1@.@2@'.format(so_version, so_version_patch, 0)
@@ -71,7 +69,7 @@ pkgconfig_variables = []
 
 base_include_directories = [include_directories('.')]
 
-generate_gi_common_args = {'install': true, 'nsversion': api_version}
+generate_gi_common_args = {'install': true, 'nsversion': gi_api_version}
 if get_option('werror')
     generate_gi_common_args += {'fatal_warnings': true}
 endif
diff --git a/c_glib/meson_options.txt b/c_glib/meson_options.txt
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/c_glib/parquet-glib/meson.build b/c_glib/parquet-glib/meson.build
@@ -1,5 +1,3 @@
-# -*- indent-tabs-mode: nil -*-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -98,11 +96,13 @@ if have_gi
         dependencies: declare_dependency(sources: arrow_glib_gir),
         export_packages: 'parquet-glib',
         extra_args: gir_scanner_extra_args + [
-            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+            '--include-uninstalled=arrow-glib/Arrow-@0@.gir'.format(
+                gi_api_version,
+            ),
         ],
         header: 'parquet-glib/parquet-glib.h',
         identifier_prefix: 'GParquet',
-        includes: ['Arrow-1.0'],
+        includes: ['Arrow-@0@'.format(gi_api_version)],
         kwargs: generate_gi_common_args,
         namespace: 'Parquet',
         sources: sources + c_headers,
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
@@ -61,21 +61,29 @@ def test_deb_package_names
     changes = parse_patch(git("log", "-p", "#{current_commit}.."))
     sampled_changes = changes.collect do |change|
       first_hunk = change[:hunks][0]
-      first_removed_line = first_hunk.find { |line| line.start_with?("-") }
-      first_added_line = first_hunk.find { |line| line.start_with?("+") }
+      first_removed_line = first_hunk.find {|line| line.start_with?("-")}
+      first_added_line = first_hunk.find {|line| line.start_with?("+")}
+      last_hunk = change[:hunks][-1]
+      last_removed_line = last_hunk.find {|line| line.start_with?("-")}
+      last_added_line = last_hunk.find {|line| line.start_with?("+")}
       {
-        sampled_diff: [first_removed_line, first_added_line],
+        first_sampled_diff: [first_removed_line, first_added_line],
+        last_sampled_diff: [last_removed_line, last_added_line],
         path: change[:path],
       }
     end
     case release_type
     when :major, :minor
       expected_changes = [
         {
-          sampled_diff: [
+          first_sampled_diff: [
             "-Package: libarrow#{@snapshot_so_version}",
             "+Package: libarrow#{@so_version}",
           ],
+          last_sampled_diff: [
+            "-  gir1.2-parquet-#{@snapshot_gi_api_version} (= ${binary:Version}),",
+            "+  gir1.2-parquet-#{@gi_api_version} (= ${binary:Version}),",
+          ],
           path: "dev/tasks/linux-packages/apache-arrow/debian/control.in",
         },
       ]
diff --git a/dev/release/post-10-bump-versions-test.rb b/dev/release/post-10-bump-versions-test.rb
@@ -381,20 +381,28 @@ def test_deb_package_names
     changes = parse_patch(log)
     sampled_changes = changes.collect do |change|
       first_hunk = change[:hunks][0]
-      first_removed_line = first_hunk.find { |line| line.start_with?("-") }
-      first_added_line = first_hunk.find { |line| line.start_with?("+") }
+      first_removed_line = first_hunk.find {|line| line.start_with?("-")}
+      first_added_line = first_hunk.find {|line| line.start_with?("+")}
+      last_hunk = change[:hunks][-1]
+      last_removed_line = last_hunk.find {|line| line.start_with?("-")}
+      last_added_line = last_hunk.find {|line| line.start_with?("+")}
       {
-        sampled_diff: [first_removed_line, first_added_line],
+        first_sampled_diff: [first_removed_line, first_added_line],
+        last_sampled_diff: [last_removed_line, last_added_line],
         path: change[:path],
       }
     end
     if bump_type.nil?
       expected_changes = [
         {
-          sampled_diff: [
+          first_sampled_diff: [
             "-Package: libarrow#{@so_version}",
             "+Package: libarrow#{@next_so_version}",
           ],
+          last_sampled_diff: [
+            "-  gir1.2-parquet-#{@gi_api_version} (= ${binary:Version}),",
+            "+  gir1.2-parquet-#{@next_gi_api_version} (= ${binary:Version}),",
+          ],
           path: "dev/tasks/linux-packages/apache-arrow/debian/control.in",
         },
       ]
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
@@ -113,6 +113,7 @@ def detect_versions
     @snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
     @snapshot_major_version = @snapshot_version.split(".")[0]
     @snapshot_so_version = compute_so_version(@snapshot_version.split("-")[0])
+    @snapshot_gi_api_version = compute_gi_api_version(@snapshot_version.split("-")[0])
     release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
     release_version_components = release_version.split(".")
     case release_type
@@ -129,6 +130,7 @@ def detect_versions
     @release_version = release_version_components.join(".")
     @release_compatible_version = compute_compatible_version(@release_version)
     @so_version = compute_so_version(@release_version)
+    @gi_api_version = compute_gi_api_version(@release_version)
     next_version_components = @release_version.split(".")
     case next_release_type
     when :major
@@ -148,6 +150,7 @@ def detect_versions
     @next_compatible_version = compute_compatible_version(@next_version)
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
+    @next_gi_api_version = compute_gi_api_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"
     @previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
     if @previous_version
@@ -164,6 +167,11 @@ def compute_so_version(version)
     Integer(major, 10) * 100 + Integer(minor, 10)
   end
 
+  def compute_gi_api_version(version)
+    major, minor, _patch = version.split(".")
+    "#{major}.#{minor}"
+  end
+
   def on_release_branch?
     @snapshot_version == @release_version
   end
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
@@ -193,32 +193,57 @@ so_version() {
   expr ${major_version} \* 100 + ${minor_version}
 }
 
+gir_api_version() {
+  local version=$1
+  local major_version=$(echo ${version} | cut -d. -f1)
+  local minor_version=$(echo ${version} | cut -d. -f2)
+  echo "${major_version}.${minor_version}"
+}
+
 update_deb_package_names() {
   local version=$1
   local next_version=$2
   echo "Updating .deb package names for ${next_version}"
-  deb_lib_suffix=$(so_version ${version})
-  next_deb_lib_suffix=$(so_version ${next_version})
+
+  local substituted=false
+
+  local deb_lib_suffix=$(so_version ${version})
+  local next_deb_lib_suffix=$(so_version ${next_version})
   if [ "${deb_lib_suffix}" != "${next_deb_lib_suffix}" ]; then
     pushd ${ARROW_DIR}/dev/tasks/linux-packages/apache-arrow
     for target in debian*/lib*${deb_lib_suffix}.install; do
       git mv \
         ${target} \
         $(echo ${target} | sed -e "s/${deb_lib_suffix}/${next_deb_lib_suffix}/")
     done
-    deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
+    local deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
     sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" debian*/control*
     rm -f debian*/control*.bak
     git add debian*/control*
+    substituted=true
     popd
+  fi
 
-    pushd ${ARROW_DIR}/dev/release
-    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" rat_exclude_files.txt
-    rm -f rat_exclude_files.txt.bak
-    git add rat_exclude_files.txt
-    git commit -m "MINOR: [Release] Update .deb package names for ${next_version}"
+  local deb_gir_suffix=$(gir_api_version ${version})
+  local next_deb_gir_suffix=$(gir_api_version ${next_version})
+  if [ "${deb_gir_suffix}" != "${next_deb_gir_suffix}" ]; then
+    pushd ${ARROW_DIR}/dev/tasks/linux-packages/apache-arrow
+    for target in debian*/gir1.2-*-${deb_gir_suffix}.install; do
+      git mv \
+        ${target} \
+        $(echo ${target} | sed -e "s/${deb_gir_suffix}/${next_deb_gir_suffix}/")
+    done
+    local deb_gir_suffix_substitute_pattern="s/(gir1\\.2-(arrow|gandiva|parquet)[-a-z]*)${deb_gir_suffix}/\\1${next_deb_gir_suffix}/g"
+    sed -i.bak -E -e "${deb_gir_suffix_substitute_pattern}" debian*/control*
+    rm -f debian*/control*.bak
+    git add debian*/control*
+    substituted=true
     popd
   fi
+
+  if [ "${substituted}" = "true" ]; then
+    git commit -m "MINOR: [Release] Update .deb package names for ${next_version}"
+  fi
 }
 
 update_linux_packages() {
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/control.in b/dev/tasks/linux-packages/apache-arrow/debian/control.in
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-cuda-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-cuda-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-dataset-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-dataset-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-flight-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-flight-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-flight-sql-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-flight-sql-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-gandiva-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-gandiva-23.0.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-parquet-23.0.install b/dev/tasks/linux-packages/apache-arrow/debian/gir1.2-parquet-23.0.install

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- indent-tabs-mode: nil --`
`2`		`-#`
`3`	`1`	`# Licensed to the Apache Software Foundation (ASF) under one`
`4`	`2`	`# or more contributor license agreements. See the NOTICE file`
`5`	`3`	`# distributed with this work for additional information`