xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xquartz/X11Application.m   |   50 ++++++++++++++++++++++++++++++++++++++++++
 hw/xquartz/bundle/meson.build |    8 ++----
 hw/xquartz/meson.build        |    2 -
 3 files changed, 53 insertions(+), 7 deletions(-)

New commits:
commit 15a413e11d186a9206a39a9b2fe4b72c065d5918
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Feb 22 23:02:42 2021 -0800

    xquartz: Update meson build to remove deleted files
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
index ec5225293..28f171c70 100644
--- a/hw/xquartz/bundle/meson.build
+++ b/hw/xquartz/bundle/meson.build
@@ -1,9 +1,7 @@
-# system-wide Xquartz server defaults file
-install_data('Xquartz.plist',
-    install_dir: join_paths(get_option('libdir'), 'X11/xserver'))
-
 # generate Info.plist
-cpp = find_program('cpp')
+# https://github.com/mesonbuild/meson/issues/8434
+#cpp = find_program('cpp')
+cpp = '/usr/bin/cpp'
 cpp_defs = [
     '-DAPPLE_APPLICATION_NAME=@0@'.format(apple_application_name),
     '-DBUNDLE_ID_PREFIX=@0@'.format(bundle_id_prefix),
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index d1c5f8a51..9e321b059 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -28,11 +28,9 @@ srcs_libxquartz = [
     'darwinXinput.c',
     'keysym2ucs.c',
     'quartz.c',
-    'quartzCocoa.m',
     'quartzKeyboard.c',
     'quartzStartup.c',
     'quartzRandR.c',
-    'console_redirect.c',
     '../../mi/miinitext.c',
     '../../mi/miinitext.h',
 ]
commit e59848548a462f1a0ac751bb8bb6afe56258cf4e
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Fri Mar 5 22:57:24 2021 -0800

    xquartz: Fix appFlags build failure with macOS 10.15+ SDKs
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index c0ec8ddb5..3db0b2487 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -77,6 +77,10 @@ static dispatch_queue_t eventTranslationQueue;
 #endif
 #endif
 
+#ifndef APPKIT_APPFLAGS_HACK
+#define APPKIT_APPFLAGS_HACK 1
+#endif
+
 extern Bool noTestExtensions;
 extern Bool noRenderExtension;
 
@@ -102,6 +106,50 @@ CFStringRef app_prefs_domain_cfstr = NULL;
 #define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | \
                        NSAlternateKeyMask | NSCommandKeyMask)
 
+#if APPKIT_APPFLAGS_HACK && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+// This was removed from the SDK in 10.15
+ at interface NSApplication () {
+ at protected
+    /* All instance variables are private */
+    short               _running;
+    struct __appFlags {
+        unsigned int        _hidden:1;
+        unsigned int        _appleEventActivationInProgress:1;
+        unsigned int        _active:1;
+        unsigned int        _hasBeenRun:1;
+        unsigned int        _doingUnhide:1;
+        unsigned int        _delegateReturnsValidRequestor:1;
+        unsigned int        _deactPending:1;
+        unsigned int        _invalidState:1;
+        unsigned int        _invalidEvent:1;
+        unsigned int        _postedWindowsNeedUpdateNote:1;
+        unsigned int        _wantsToActivate:1;
+        unsigned int        _doingHide:1;
+        unsigned int        _dontSendShouldTerminate:1;
+        unsigned int        _ignoresFullScreen:1;
+        unsigned int        _finishedLaunching:1;
+        unsigned int        _hasEventDelegate:1;
+        unsigned int        _appTerminating:1;
+        unsigned int        _didNSOpenOrPrint:1;
+        unsigned int        _inDealloc:1;
+        unsigned int        _pendingDidFinish:1;
+        unsigned int        _hasKeyFocus:1;
+        unsigned int        _panelsNonactivating:1;
+        unsigned int        _hiddenOnLaunch:1;
+        unsigned int        _openStatus:2;
+        unsigned int        _batchOrdering:1;
+        unsigned int        _waitingForTerminationReply:1;
+        unsigned int        _unused:1;
+        unsigned int        _enumeratingMemoryPressureHandlers:1;
+        unsigned int        _didTryRestoringPersistentState:1;
+        unsigned int        _windowDragging:1;
+        unsigned int        _mightBeSwitching:1;
+    }                   _appFlags;
+    id                  _mainMenu;
+}
+ at end
+#endif
+
 @interface NSApplication (Internal)
 - (void)_setKeyWindow:(id)window;
 - (void)_setMainWindow:(id)window;
@@ -375,10 +423,12 @@ QuartzModeBundleInit(void);
                 BOOL order_all_windows = YES, workspaces, ok;
                 for_appkit = NO;
 
+#if APPKIT_APPFLAGS_HACK
                 /* FIXME: This is a hack to avoid passing the event to AppKit which
                  *        would result in it raising one of its windows.
                  */
                 _appFlags._active = YES;
+#endif
 
                 [self set_front_process:nil];