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

xquartz: Update Sparkle configuration to use SUPublicEDKey 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-19 19:55:44 -07:00
parent 0a27f96d1d
commit 1d90bef30c
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/bundle/Info.plist.cpp
View File

@ -31,8 +31,8 @@
#ifdef XQUARTZ_SPARKLE #ifdef XQUARTZ_SPARKLE
<key>SUEnableAutomaticChecks</key> <key>SUEnableAutomaticChecks</key>
<true/> <true/>
<key>SUPublicDSAKeyFile</key> <key>SUPublicEDKey</key>
<string>sparkle.pem</string> <string>XQUARTZ_SPARKLE_PUBLIC_EDKEY</string>
<key>SUFeedURL</key> <key>SUFeedURL</key>
<string>XQUARTZ_SPARKLE_FEED_URL</string> <string>XQUARTZ_SPARKLE_FEED_URL</string>
#endif #endif

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

@ -13,6 +13,7 @@ if build_sparkle
cpp_defs += [ cpp_defs += [
'-DXQUARTZ_SPARKLE', '-DXQUARTZ_SPARKLE',
'-DXQUARTZ_SPARKLE_FEED_URL=@0@'.format(xquartz_sparkle_feed_url), '-DXQUARTZ_SPARKLE_FEED_URL=@0@'.format(xquartz_sparkle_feed_url),
'-DXQUARTZ_SPARKLE_PUBLIC_EDKEY=@0@'.format(xquartz_sparkle_public_edkey),
] ]
endif endif

3
hw/xquartz/meson.build
View File

@ -4,6 +4,7 @@ apple_applications_dir = get_option('apple-applications-dir')
apple_application_name = get_option('apple-application-name') apple_application_name = get_option('apple-application-name')
bundle_id_prefix = get_option('bundle-id-prefix') bundle_id_prefix = get_option('bundle-id-prefix')
xquartz_sparkle_feed_url = get_option('sparkle-feed-url') xquartz_sparkle_feed_url = get_option('sparkle-feed-url')
xquartz_sparkle_public_edkey = get_option('sparkle-public-edkey')
bundle_version_string = meson.project_version() # CFBundleShortVersionString bundle_version_string = meson.project_version() # CFBundleShortVersionString
bundle_version = release # CFBundleVersion bundle_version = release # CFBundleVersion
@ -13,7 +14,7 @@ bundle_id_def = '-DBUNDLE_ID_PREFIX="@0@"'.format(bundle_id_prefix)
bundle_root = join_paths(apple_applications_dir, apple_application_name + '.app') bundle_root = join_paths(apple_applications_dir, apple_application_name + '.app')
# using sparkle update framework? # using sparkle update framework?
build_sparkle = xquartz_sparkle_feed_url != '' 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')
endif endif

2
meson_options.txt
View File

@ -122,6 +122,8 @@ option('bundle-id-prefix', type: 'string', value: 'org.x',
description: 'RDNS prefix for bundle identifier') description: 'RDNS prefix for bundle identifier')
option('sparkle-feed-url', type: 'string', option('sparkle-feed-url', type: 'string',
description: 'Feed URL for autoupdating with the Sparkle Framework (default: disabled)') description: 'Feed URL for autoupdating with the Sparkle Framework (default: disabled)')
option('sparkle-public-edkey', type: 'string',
description: 'Public EdDSA key for verifying updates from the Sparkle feed (default: disabled)')
option('xpbproxy', type: 'boolean', value: false, option('xpbproxy', type: 'boolean', value: false,
description: 'Build a standalone X pasteboard proxy') description: 'Build a standalone X pasteboard proxy')