diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2016-01-02 01:09:33 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2016-01-02 00:11:21 +0000 |
| commit | 945251627e76fbb54083e879610c5303c0470817 (patch) | |
| tree | e7c1c75ca1a13a577a96e29e0974a757774c0b4e /macosx-setup.sh | |
| parent | 1b444a7e5dd21e6ae8364a4ae5b94c06d1f56c7d (diff) | |
| download | wireshark-945251627e76fbb54083e879610c5303c0470817.tar.gz | |
Update PNG_VERSION to the only version that actually exists.
At least with Qt5.5.1 there is no duplicate clang_64 in the qt path.
Change-Id: I2ac66f246b3c9dbe2155ee8394d31e7d560faaf9
Reviewed-on: https://code.wireshark.org/review/13000
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 90f0d7c426..487ce13634 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -93,7 +93,7 @@ if [ "$GTK_VERSION" ]; then ATK_VERSION=2.8.0 PANGO_VERSION=1.30.1 - PNG_VERSION=1.6.17 + PNG_VERSION=1.6.20 PIXMAN_VERSION=0.26.0 CAIRO_VERSION=1.12.2 GDK_PIXBUF_VERSION=2.28.0 @@ -2336,7 +2336,7 @@ echo "" pkg_config_path=/usr/local/lib/pkgconfig if [ "$QT_VERSION" ]; then qt_base_path=$HOME/Qt$QT_VERSION/$QT_MAJOR_MINOR_VERSION/clang_64 - pkg_config_path="$pkg_config_path":"$qt_base_path/clang_64/lib/pkgconfig" + pkg_config_path="$pkg_config_path":"$qt_base_path/lib/pkgconfig" CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH":"$qt_base_path/lib/cmake" fi pkg_config_path="$pkg_config_path":/usr/X11/lib/pkgconfig |