diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-06-25 11:58:36 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:17:21 -0400 |
commit | b197cc08b18bc44a3e93f859ca7e61dfe335bbc5 (patch) | |
tree | 71f13f57241c29becff4a2889ca527b1aed1270d | |
parent | 778df432eb9bba4441d4c47cdbfbcd385b1e9d42 (diff) | |
download | pango-b197cc08b18bc44a3e93f859ca7e61dfe335bbc5.tar.gz |
Versioning gymnastics
Change our versioning setup from "pango 2.0" to "pango2 1.0".
The shared library we install is now libpango2, and the
headers go in /usr/include/pango2-1.0/pango2/.
-rw-r--r-- | meson.build | 6 | ||||
-rw-r--r-- | pango/meson.build | 8 | ||||
-rw-r--r-- | pango/pango-version-macros.h | 32 |
3 files changed, 23 insertions, 23 deletions
diff --git a/meson.build b/meson.build index 2f8319d6..01cd8fd2 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('pango2', 'c', 'cpp', - version: '1.90.0', + version: '0.91.0', license: 'LGPLv2.1+', default_options: [ 'buildtype=debugoptimized', @@ -37,8 +37,8 @@ pango_interface_age = pango_minor_version.is_odd() ? 0 : pango_micro_version pango_binary_age = api_minor * 100 + pango_micro_version pango_api_version = '@0@.0'.format(api_major) -pango_api_name = 'pango-@0@'.format(pango_api_version) -pango_api_path = join_paths(pango_api_name, 'pango') +pango_api_name = 'pango2-@0@'.format(pango_api_version) +pango_api_path = join_paths(pango_api_name, 'pango2') pango_conf = configuration_data() diff --git a/pango/meson.build b/pango/meson.build index 5d3c5ead..8dce43d8 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -280,7 +280,7 @@ if harfbuzz_dep.type_name() == 'pkgconfig' endif pkgconfig.generate(libpango, - name: 'Pango', + name: 'Pango2', description: 'Internationalized text handling', requires: pango_pkg_requires, filebase: 'pango2', @@ -289,10 +289,10 @@ pkgconfig.generate(libpango, if cairo_dep.found() pkgconfig.generate(libpango, - name: 'Pango Cairo', - description: 'Cairo rendering support for Pango', + name: 'Pango2 Cairo', + description: 'Cairo rendering support for Pango2', requires: ['pango2'], - filebase: 'pangocairo2', + filebase: 'pango2cairo', subdirs: pango_api_name, ) endif diff --git a/pango/pango-version-macros.h b/pango/pango-version-macros.h index ddf93837..c40f373d 100644 --- a/pango/pango-version-macros.h +++ b/pango/pango-version-macros.h @@ -34,20 +34,20 @@ /* XXX: Every new stable minor release bump should add a macro here */ /** - * PANGO2_VERSION_1_90 + * PANGO2_VERSION_0_90 * - * A macro that evaluates to the 1.90 version of Pango2, in a format + * A macro that evaluates to the 0.90 version of Pango2, in a format * that can be used by the C pre-processor. */ -#define PANGO2_VERSION_1_90 (G_ENCODE_VERSION (1, 90)) +#define PANGO2_VERSION_0_90 (G_ENCODE_VERSION (0, 90)) /** - * PANGO2_VERSION_2_0 + * PANGO2_VERSION_1_0 * - * A macro that evaluates to the 2.0 version of Pango2, in a format + * A macro that evaluates to the 1.0 version of Pango2, in a format * that can be used by the C pre-processor. */ -#define PANGO2_VERSION_2_0 (G_ENCODE_VERSION (2, 0)) +#define PANGO2_VERSION_1_0 (G_ENCODE_VERSION (1, 0)) /* evaluates to the current stable version; for development cycles, * this means the next stable target @@ -123,8 +123,8 @@ #if PANGO2_VERSION_MAX_ALLOWED < PANGO2_VERSION_MIN_REQUIRED #error "PANGO2_VERSION_MAX_ALLOWED must be >= PANGO2_VERSION_MIN_REQUIRED" #endif -#if PANGO2_VERSION_MIN_REQUIRED < PANGO2_VERSION_1_90 -#error "PANGO2_VERSION_MIN_REQUIRED must be >= PANGO2_VERSION_1_90" +#if PANGO2_VERSION_MIN_REQUIRED < PANGO2_VERSION_0_90 +#error "PANGO2_VERSION_MIN_REQUIRED must be >= PANGO2_VERSION_0_90" #endif /* These macros are used to mark deprecated functions in Pango2 headers, @@ -142,16 +142,16 @@ /* XXX: Every new stable minor release should add a set of macros here */ -#if PANGO2_VERSION_MIN_REQUIRED >= PANGO2_VERSION_2_0 -# define PANGO2_DEPRECATED_IN_2_0 PANGO2_DEPRECATED -# define PANGO2_DEPRECATED_IN_2_0_FOR(f) PANGO2_DEPRECATED_FOR(f) +#if PANGO2_VERSION_MIN_REQUIRED >= PANGO2_VERSION_1_0 +# define PANGO2_DEPRECATED_IN_1_0 PANGO2_DEPRECATED +# define PANGO2_DEPRECATED_IN_1_0_FOR(f) PANGO2_DEPRECATED_FOR(f) #else -# define PANGO2_DEPRECATED_IN_2_0 _PANGO2_EXTERN -# define PANGO2_DEPRECATED_IN_2_0_FOR(f) _PANGO2_EXTERN +# define PANGO2_DEPRECATED_IN_1_0 _PANGO2_EXTERN +# define PANGO2_DEPRECATED_IN_1_0_FOR(f) _PANGO2_EXTERN #endif -#if PANGO2_VERSION_MAX_ALLOWED < PANGO2_VERSION_2_0 -# define PANGO2_AVAILABLE_IN_2_0 PANGO2_UNAVAILABLE(2, 0) +#if PANGO2_VERSION_MAX_ALLOWED < PANGO2_VERSION_1_0 +# define PANGO2_AVAILABLE_IN_1_0 PANGO2_UNAVAILABLE(2, 0) #else -# define PANGO2_AVAILABLE_IN_2_0 _PANGO2_EXTERN +# define PANGO2_AVAILABLE_IN_1_0 _PANGO2_EXTERN #endif |