Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: GitHub noreply@github.com Date: Tue, 15 Nov 2022 08:58:17 UTC Commit: 96342f3eb94dc6d49a05a65c9d73becca9009aa0 https://github.com/geany/geany/commit/96342f3eb94dc6d49a05a65c9d73becca9009a...

Log Message: ----------- Merge pull request #3301 from techee/integration_fix2

Fix gtk-mac-integration not being used when using meson

Modified Paths: -------------- meson.build

Modified: meson.build 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -23,7 +23,7 @@ foreach dep : deps_in deps_for_pc += ' ' + dep[0] + ' >= ' + dep[1] endforeach

-mac_integration = dependency('gtk-mac-integration', version: '>= 3.0.1', +dep_mac_integration = dependency('gtk-mac-integration', version: '>= 3.0.1', required: get_option('mac-integration'))

glib = deps[0] @@ -847,12 +847,12 @@ libgeany = shared_library('geany', 'src/utils.h', gen_src, win_src, - mac_integration.found() ? ['src/osx.c', 'src/osx.h'] : [], + dep_mac_integration.found() ? ['src/osx.c', 'src/osx.h'] : [], host_machine.system() == 'windows' ? ['src/win32.c', 'src/win32.h'] : [ 'src/vte.c', 'src/vte.h' ], soversion: '0', c_args: geany_cflags + [ '-DG_LOG_DOMAIN="Geany"' ], include_directories: [iscintilla], - dependencies: [dep_tagmanager, dep_ctags, dep_scintilla] + deps + win_deps, + dependencies: [dep_tagmanager, dep_ctags, dep_scintilla, dep_mac_integration] + deps + win_deps, install: true ) dep_libgeany = declare_dependency(

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).