[gtk/gtk-3-24: 1/2] meson: fix darwin_versions



commit e65699e9c167b08b8ce3cea5d3abbdf525137eac
Author: Tom Schoonjans <tom schoonjans diamond ac uk>
Date:   Tue Jul 9 19:39:41 2019 +0000

    meson: fix darwin_versions
    
    This commit fixes the values passed to darwin_versions. When
    transitioning from an autotools build, one should always use:
    
            [lt_current + 1, '@0@.@1@.0'.format(lt_current + 1, lt_revision)]

 libgail-util/meson.build | 1 +
 meson.build              | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/libgail-util/meson.build b/libgail-util/meson.build
index 90fe93ca58..ffce5788ea 100644
--- a/libgail-util/meson.build
+++ b/libgail-util/meson.build
@@ -20,6 +20,7 @@ endif
 libgailutil = shared_library('gailutil-3',
                              soversion: gtk_soversion,
                              version: gail_library_version,
+                             darwin_versions: ['1', '1.0'],
                              sources: [gailutil_sources],
                              dependencies: libgtk_dep,
                              include_directories: [confinc, gtkinc],
diff --git a/meson.build b/meson.build
index c6f43d5ebd..0f818eedbd 100644
--- a/meson.build
+++ b/meson.build
@@ -121,7 +121,8 @@ else
   gail_library_version = '0.0.0'
 endif
 
-gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_minor_version) + 1, 
gtk_micro_version)]
+osx_current = gtk_binary_age - gtk_interface_age + 1
+gtk_osxversions = [osx_current, '@0@.@1@.0'.format(osx_current, gtk_interface_age)]
 
 gtk_api_version = '@0@.0'.format(gtk_major_version)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]