xserver: Branch 'server-21.1-branch' - 3 commits

[GitLab Mirror]

 hw/xquartz/bundle/Info.plist.cpp |    8 ++++----
 hw/xquartz/bundle/meson.build    |    1 +
 hw/xquartz/meson.build           |    3 ++-
 meson.build                      |    2 +-
 meson_options.txt                |    2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 37285e6252ce3afca5bc205121f83271548dfca9
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Jun 19 19:56:26 2022 -0700

    xquartz: Update copyright for 2022
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit b12f5dc62d964d0279e1fa9403259cfd8e491285)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 00da2a850..323dec205 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -39,9 +39,9 @@
 	<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>
-		<string>© 2003-2021 Apple Inc.
+		<string>© 2003-2022 Apple Inc.
 © 2003 XFree86 Project, Inc.
-© 2003-2021 X.org Foundation, Inc.
+© 2003-2022 X.org Foundation, Inc.
 </string>
 	<key>NSMainNibFile</key>
 		<string>main</string>
commit 96e7b55c5d6898a6715b62d5e01581617d218997
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Jun 19 19:55:44 2022 -0700

    xquartz: Update Sparkle configuration to use SUPublicEDKey
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 1d90bef30c4dfe13dd5e70fea606a02380cbcee6)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 6314c7181..00da2a850 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -31,8 +31,8 @@
 #ifdef XQUARTZ_SPARKLE
 	<key>SUEnableAutomaticChecks</key>
 		<true/>
-	<key>SUPublicDSAKeyFile</key>
-		<string>sparkle.pem</string>
+	<key>SUPublicEDKey</key>
+		<string>XQUARTZ_SPARKLE_PUBLIC_EDKEY</string>
         <key>SUFeedURL</key>
                 <string>XQUARTZ_SPARKLE_FEED_URL</string>
 #endif
diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
index 28f171c70..20afb96ea 100644
--- a/hw/xquartz/bundle/meson.build
+++ b/hw/xquartz/bundle/meson.build
@@ -13,6 +13,7 @@ if build_sparkle
 cpp_defs += [
     '-DXQUARTZ_SPARKLE',
     '-DXQUARTZ_SPARKLE_FEED_URL=@0@'.format(xquartz_sparkle_feed_url),
+    '-DXQUARTZ_SPARKLE_PUBLIC_EDKEY=@0@'.format(xquartz_sparkle_public_edkey),
 ]
 endif
 
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index deae2b3c9..eb38c1fb5 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -4,6 +4,7 @@ apple_applications_dir = get_option('apple-applications-dir')
 apple_application_name = get_option('apple-application-name')
 bundle_id_prefix = get_option('bundle-id-prefix')
 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 = 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')
 
 # using sparkle update framework?
-build_sparkle = xquartz_sparkle_feed_url != ''
+build_sparkle = xquartz_sparkle_feed_url != '' and xquartz_sparkle_public_edkey != ''
 if build_sparkle
     sparkle = dependency('Sparkle', method: 'extraframework')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 906f13c48..f35048da0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -118,6 +118,8 @@ option('bundle-id-prefix', type: 'string', value: 'org.x',
         description: 'RDNS prefix for bundle identifier')
 option('sparkle-feed-url', type: 'string',
         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,
         description: 'Build a standalone X pasteboard proxy')
 
commit 6465263be8ae98283f8e99a3e95d04e786386040
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Jun 19 22:18:16 2022 -0700

    meson: Bump requirement to meson-0.50.0
    
    WARNING: Project specifies a minimum meson_version '>= 0.47.0' but uses features which were added in newer versions:
     * 0.50.0: {'install arg in configure_file'}
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 0a27f96d1d0e474b308be982fa7069d3ae0d9892)

diff --git a/meson.build b/meson.build
index 9ea7e1d76..d68cabc66 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
             'c_std=gnu99',
         ],
         version: '21.1.3',
-        meson_version: '>= 0.47.0',
+        meson_version: '>= 0.50.0',
 )
 release_date = '2022-01-02'