Wireshark-commits: [Wireshark-commits] master 93b5a31: When building an OS X package for GTK+, put

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 17 Jun 2014 22:06:14 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=93b5a313ada6684c7706da7a578f7787344d6144
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

93b5a31 by Guy Harris (guy@xxxxxxxxxxxx):

    When building an OS X package for GTK+, put the libraries in lib.
    
    This reverts to the way we did it prior to the switch to Qt; with GTK+,
    Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is
    in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry
    would be @executable_path/../lib - @executable_path/../Frameworks, which
    works for the Qt version, in which Contents/MacOS/Wireshark is the
    actual executable, doesn't work for the GTK+ version.
    
    This should fix bug 10185.
    
    Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65
    Reviewed-on: https://code.wireshark.org/review/2347
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  ba6eb5c   Set the rlc len field before we try to use it in an expert info.
    adds  93b5a31   When building an OS X package for GTK+, put the libraries in lib.


Summary of changes:
 packaging/macosx/osx-app.sh |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)