callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Set the compatibility version correctly on macOS

Browse Source 
And bump to Meson 0.48 as this feature requires it.
This commit is contained in:
Philippe Normand
2018-11-25 17:17:29 +00:00
committed by Christoph Reiter
parent 4eb2f297f1
commit 215c2be76f
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/meson.build
View File

@ -269,6 +269,7 @@ libgdk = shared_library('gdk-3',
] + common_cflags, ] + common_cflags,
link_whole: gdk_backends, link_whole: gdk_backends,
link_args: common_ldflags, link_args: common_ldflags,
darwin_versions : gtk_osxversions,
install: true) install: true)
libgdk_dep = declare_dependency( libgdk_dep = declare_dependency(

1
gtk/meson.build
View File

@ -897,6 +897,7 @@ libgtk = shared_library('gtk-3',
dependencies: gtk_deps + [libgdk_dep], dependencies: gtk_deps + [libgdk_dep],
link_with: libgdk, link_with: libgdk,
link_args: common_ldflags, link_args: common_ldflags,
darwin_versions : gtk_osxversions,
install: true) install: true)
gtk_dep_sources = [gtkversion, gtktypebuiltins_h] gtk_dep_sources = [gtkversion, gtktypebuiltins_h]

9
meson.build
View File

@ -5,7 +5,7 @@ project('gtk+-3.0', 'c',
'c_std=gnu89', 'c_std=gnu89',
'warning_level=1' 'warning_level=1'
], ],
meson_version : '>= 0.43.0', meson_version : '>= 0.48.0',
license: 'LGPLv2.1+') license: 'LGPLv2.1+')
glib_major_req = 2 glib_major_req = 2
@ -79,6 +79,7 @@ gtk_binary_version = '3.0.0'
gtk_binary_age = 100 * gtk_minor_version + gtk_micro_version gtk_binary_age = 100 * gtk_minor_version + gtk_micro_version
gtk_soversion = '0.@0@.@1@'.format(gtk_binary_age - gtk_interface_age, gtk_interface_age) gtk_soversion = '0.@0@.@1@'.format(gtk_binary_age - gtk_interface_age, gtk_interface_age)
gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_minor_version) + 1, gtk_micro_version)]
gtk_api_version = '@0@.0'.format(gtk_major_version) gtk_api_version = '@0@.0'.format(gtk_major_version)
@ -286,12 +287,6 @@ if os_unix and not os_darwin
endforeach endforeach
endif endif
# Maintain compatibility with autotools
if os_darwin
common_ldflags += [ '-compatibility_version 1', '-current_version 1.0', ]
endif
confinc = include_directories('.') confinc = include_directories('.')
gdkinc = include_directories('gdk') gdkinc = include_directories('gdk')
gtkinc = include_directories('gtk') gtkinc = include_directories('gtk')