Opened 4 years ago

Closed 4 years ago

#62477 closed defect (fixed)

xorg-server-legacy-1.20.10_0: build errors on 10.5 Leopard Intel

Reported by: kencu (Ken) Owned by: jeremyhu (Jeremy Huddleston Sequoia)
Priority: Normal Milestone:
Component: ports Version:
Keywords: leopard legacy Cc:
Port: xorg-server-legacy

Description

working my way down the systems. 10.6 was fixed quite easily with the legacysupport PG for strnlen (and others?).

10.5 Intel fails with this:

:info:build quartz.c:379:9: error: implicit declaration of function 'xp_disable_hot_keys' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
:info:build         xp_disable_hot_keys(XQuartzFullscreenVisible);
:info:build         ^

I fixed that with the patch attached, and then another dangling use of something that was related to libdispatch was patched out as well with the next patch.

And with that, it built, and seems to work, although I'm not sure how to test the hotkeys thing exactly. I may not have done it 100% as it should be, so will put here for thoughts before pushing.

After this comes 10.5 PPC and then Tiger.

Attachments (3)

xorg-server-legacy-fail-leopard-intel.log (1.3 MB) - added by kencu (Ken) 4 years ago.
patch-xorg-server-legacy-xp-disable-hotkeys.diff (483 bytes) - added by kencu (Ken) 4 years ago.
patch-xorg-server-legacy-dispatchfix.diff (479 bytes) - added by kencu (Ken) 4 years ago.

Download all attachments as: .zip

Change History (6)

Changed 4 years ago by kencu (Ken)

Changed 4 years ago by kencu (Ken)

Changed 4 years ago by kencu (Ken)

comment:1 Changed 4 years ago by kencu (Ken)

  • hw/xquartz/quartz.c

    old new  
    374374    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
    375375
    376376    xp_reenable_update();
    377 
    378     if (XQuartzFullscreenDisableHotkeys)
    379         xp_disable_hot_keys(XQuartzFullscreenVisible);
    380377}
    381378
    382379void
     
    407404    X11ApplicationShowHideMenubar(TRUE);
    408405
    409406    xp_reenable_update();
    410 
    411     xp_disable_hot_keys(FALSE);
    412407}
    413408
    414409/*

comment:2 Changed 4 years ago by kencu (Ken)

  • hw/xquartz/X11Application.m

    old new  
    312312    /* Don't try sending to X if we haven't initialized.  This can happen if AppKit takes over
    313313     * (eg: uncaught exception) early in launch.
    314314     */
     315
     316#ifdef HAVE_LIBDISPATCH
    315317    if (!eventTranslationQueue) {
    316318        [super sendEvent:e];
    317319        return;
    318320    }
     321#endif
    319322
    320323    OSX_BOOL for_appkit, for_x;
    321324

comment:3 Changed 4 years ago by jeremyhu (Jeremy Huddleston Sequoia)

Resolution: fixed
Status: assignedclosed

In bc3b072cfd3a9816ada5f392a1d0afd55c158f40/macports-ports (master):

xorg-server-legacy: Addrese a build failure on Tiger and Leopard

Fixes: #62477
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@…>

Note: See TracTickets for help on using tickets.