diff options
author | Michael Tüxen <tuexen@fh-muenster.de> | 2011-12-10 09:48:59 +0000 |
---|---|---|
committer | Michael Tüxen <tuexen@fh-muenster.de> | 2011-12-10 09:48:59 +0000 |
commit | 08a00ee1da0f108cd9e69a7589c6de870304d4cf (patch) | |
tree | 5074893158110672e1e193693ec246333b6a99d6 | |
parent | baa8f66c738d418982f2057606eb513960548055 (diff) | |
download | wireshark-08a00ee1da0f108cd9e69a7589c6de870304d4cf.tar.gz |
Update some support libs to newer version.
svn path=/trunk/; revision=40145
-rwxr-xr-x | macosx-setup.sh | 10 | ||||
-rw-r--r-- | macosx-support-lib-patches/glib-pkgconfig.patch | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index d0781c0d96..99ebfa60f6 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -14,7 +14,7 @@ # The following libraries are required. # GETTEXT_VERSION=0.18.1.1 -GLIB_VERSION=2.29.8 +GLIB_VERSION=2.31.2 # # pkg-config 0.26 appears to have broken the "we have our own GLib" # stuff, even if you explicitly set GLIB_CFLAGS and GLIB_LIBS. @@ -23,9 +23,9 @@ GLIB_VERSION=2.29.8 # PKG_CONFIG_VERSION=0.26 ATK_VERSION=2.0.1 -PANGO_VERSION=1.29.3 -GDK_PIXBUF_VERSION=2.23.4 -GTK_VERSION=2.24.5 +PANGO_VERSION=1.29.5 +GDK_PIXBUF_VERSION=2.24.0 +GTK_VERSION=2.24.8 # # The following libraries are optional. @@ -47,7 +47,7 @@ LIBGPG_ERROR_VERSION=1.10 LIBGCRYPT_VERSION=1.4.6 GNUTLS_VERSION=2.12.7 LUA_VERSION=5.1.4 -PORTAUDIO_VERSION=pa_stable_v19_20110326 +PORTAUDIO_VERSION=pa_stable_v19_20111121 # # XXX - they appear to have an unversioned gzipped tarball for the # current version; should we just download that, with some other diff --git a/macosx-support-lib-patches/glib-pkgconfig.patch b/macosx-support-lib-patches/glib-pkgconfig.patch index 37eb2a6862..b8c66c7e26 100644 --- a/macosx-support-lib-patches/glib-pkgconfig.patch +++ b/macosx-support-lib-patches/glib-pkgconfig.patch @@ -3,7 +3,7 @@ @@ -7,6 +7,6 @@ Description: GLib Type, Object, Parameter and Signal Library Requires: glib-2.0,gthread-2.0 - Version: 2.29.8 + Version: 2.31.2 -Libs: -L${libdir} -lgobject-2.0 +Libs: -L${libdir} -lgobject-2.0 -lffi Libs.private: -L/usr/lib |