Wireshark-commits: [Wireshark-commits] master-1.12 11f2e86: Have Wireshark.app try to fix broken XQ
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 23 May 2015 01:37:13 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=11f2e869e49fe89e132e44a8006e499d6d5fdd0a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

11f2e86 by Guy Harris (guy@xxxxxxxxxxxx):

    Have Wireshark.app try to fix broken XQuartz installations.
    
    If the user had a pre-Yosemite system with XQuartz installed, and
    upgraded to Yosemite, the Yosemite installer will have removed the
    /usr/X11 symlink.  If we have /opt/X11 but not /usr/X11, ask the user if
    we should fix the XQuartz installation and, if they say to do so, run a
    little helper as root in order to re-install the symlink.
    
    Bug: 10640
    Change-Id: I0495bd60b7c913ad04eb4ef62817dc39bcebefe7
    Reviewed-on: https://code.wireshark.org/review/8595
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  51f7a9a   p1: Fixed do_address for extension attributes
    adds  11f2e86   Have Wireshark.app try to fix broken XQuartz installations.


Summary of changes:
 packaging/macosx/Resources/XQuartzFixer.c          |   17 ++++
 .../ScriptExec.xcodeproj/project.pbxproj           |    4 +
 packaging/macosx/ScriptExec/main.c                 |  107 +++++++++++++++++++-
 packaging/macosx/osx-app.sh                        |    2 +
 4 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 packaging/macosx/Resources/XQuartzFixer.c