[gnome-bluetooth] build: Bump API version
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] build: Bump API version
- Date: Thu, 28 Oct 2021 15:29:58 +0000 (UTC)
commit d2d44a68b5fb2c7a66c5f1197f119a01d4e5b32e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Oct 26 21:03:12 2021 -0300
build: Bump API version
We're about to break the public API due to the GTK4 transition
so preemptively bump the API version. However, given that GNOME
Shell uses gnome-bluetooth (and has other GTK3 dependencies),
making gnome-bluetooth-2.0 parallel installable is our only option.
Bump the API version, and make gnome-bluetooth-2.0 parallel
installable with 1.0. Do that by using the 'gnomebt_api_name'
meson variable, which contains meson.project_name() + API version,
as the library name and install location.
lib/meson.build | 6 +++---
meson.build | 2 +-
tests/integration-test | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index 5ce62650..35c7c01a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -10,7 +10,7 @@ headers = enum_headers + files(
install_headers(
headers,
- subdir: meson.project_name(),
+ subdir: gnomebt_api_name,
)
sources = files(
@@ -80,7 +80,7 @@ symbol_map = meson.current_source_dir() / (meson.project_name() + '.map')
ldflags = cc.get_supported_link_arguments('-Wl,--version-script,' + symbol_map)
libgnome_bluetooth = shared_library(
- meson.project_name(),
+ gnomebt_api_name,
sources: sources + built_sources,
version: libversion,
include_directories: top_inc,
@@ -103,7 +103,7 @@ pkg.generate(
name: gnomebt_api_name,
description: 'Widgets for Bluetooth device selection',
filebase: gnomebt_api_name,
- subdirs: meson.project_name(),
+ subdirs: gnomebt_api_name,
requires: deps,
variables: 'exec_prefix=${prefix}',
)
diff --git a/meson.build b/meson.build
index badeb896..536acc29 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ gnomebt_major_version = version_array[0].to_int()
gnomebt_minor_version = version_array[1].to_int()
gnomebt_micro_version = version_array[2].to_int()
-gnomebt_api_version = '1.0'
+gnomebt_api_version = '2.0'
gnomebt_api_name = '@0@-@1@'.format(meson.project_name(), gnomebt_api_version)
gnomebt_gir_ns = 'GnomeBluetooth'
diff --git a/tests/integration-test b/tests/integration-test
index 72b4b8d0..ff32fe96 100755
--- a/tests/integration-test
+++ b/tests/integration-test
@@ -41,7 +41,7 @@ try:
GIRepository.Repository.prepend_library_path(builddir + '/lib/')
GIRepository.Repository.prepend_search_path(builddir + '/lib/')
- gi.require_version('GnomeBluetoothPriv', '1.0')
+ gi.require_version('GnomeBluetoothPriv', '2.0')
from gi.repository import GnomeBluetoothPriv
except ImportError as e:
sys.stderr.write('Could not find GnomeBluetoothPriv gobject-introspection data in the build dir: %s\n' %
str(e))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]