frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xquartz: Use correct defines when building to support Sparkle updates 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-07-01 14:26:06 -07:00
parent 727507eb31
commit aa636b97c6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/bundle/meson.build
View File

@ -10,11 +10,7 @@ cpp_defs = [
] ]
if build_sparkle if build_sparkle
cpp_defs += [ cpp_defs += sparkle_defs
'-DXQUARTZ_SPARKLE',
'-DXQUARTZ_SPARKLE_FEED_URL=@0@'.format(xquartz_sparkle_feed_url),
'-DXQUARTZ_SPARKLE_PUBLIC_EDKEY=@0@'.format(xquartz_sparkle_public_edkey),
]
endif endif
# bundle data # bundle data

9
hw/xquartz/meson.build
View File

@ -28,6 +28,14 @@ bundle_root = join_paths(apple_applications_dir, apple_application_name + '.app'
build_sparkle = xquartz_sparkle_feed_url != '' and xquartz_sparkle_public_edkey != '' build_sparkle = xquartz_sparkle_feed_url != '' and xquartz_sparkle_public_edkey != ''
if build_sparkle if build_sparkle
sparkle = dependency('Sparkle', method: 'extraframework') sparkle = dependency('Sparkle', method: 'extraframework')
sparkle_defs = [
'-DXQUARTZ_SPARKLE',
'-DXQUARTZ_SPARKLE_FEED_URL=@0@'.format(xquartz_sparkle_feed_url),
'-DXQUARTZ_SPARKLE_PUBLIC_EDKEY=@0@'.format(xquartz_sparkle_public_edkey),
]
else
sparkle_defs = []
endif endif
# libxquartz # libxquartz
@ -56,6 +64,7 @@ libxquartz_defs = [
'-DXQUARTZ', '-DXQUARTZ',
'-DXSERVER_VERSION="@0@"'.format(meson.project_version()), '-DXSERVER_VERSION="@0@"'.format(meson.project_version()),
bundle_id_def, bundle_id_def,
sparkle_defs,
] ]
if cc.has_function('dispatch_async') if cc.has_function('dispatch_async')