Commit Graph

18 Commits

Author SHA1 Message Date
Jörg Mayer 2602372010 Add a comment to prevent acidentally bumping lua version to 5.2 again.
svn path=/trunk/; revision=43366
2012-06-19 14:48:36 +00:00
Jörg Mayer 2a58400811 Downgrade Lua from 5.2.1 to 5.1.5: Lua 5.2 is API incompatible
with Lua 5.1.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7373

svn path=/trunk/; revision=43358
2012-06-19 13:31:49 +00:00
Jörg Mayer ffdddb1228 update lua 5.2.0 -> 5.2.1
svn path=/trunk/; revision=43306
2012-06-17 12:07:46 +00:00
Jörg Mayer 2d935ea939 - Update cmake, gnutls and pixman to current version
- unpack an xz file with xzcat instead of gzcat
- remove some trailing whitespace
- the update of gnutls required two changes in the gnutls
  build stuff: a) gnutls.pc is now generated from gnutls.pc.in
  and b) we now need to build with --without-p11-kit

svn path=/trunk/; revision=42861
2012-05-27 10:15:56 +00:00
Michael Tüxen 892f054257 Use some newer versions.
svn path=/trunk/; revision=42687
2012-05-17 20:49:09 +00:00
Michael Tüxen 5ccba8f2d3 Bump some version numbers.
svn path=/trunk/; revision=41551
2012-03-14 19:14:29 +00:00
Michael Tüxen 4e58ec540f Update to glib 2.31.20.
One patch is not required anymore, since it has been included.

svn path=/trunk/; revision=41546
2012-03-14 16:56:20 +00:00
Jörg Mayer 624de2e37f Fix bootstrap parameters for cmake
Conditionally display build instructions for the cmake case

svn path=/trunk/; revision=40528
2012-01-16 00:05:14 +00:00
Jörg Mayer d038e58987 Optionally build cmake, document why we need xz
svn path=/trunk/; revision=40498
2012-01-14 14:40:58 +00:00
Jörg Mayer 882d76f2b9 - Update the graphical packages
- Newer versions of glib etc require xz. At least Snow Leopard
  does not provide xz, so (unconditionally) download and install this first.
- Put in infrastructure to set up a GTK3 environment instead of GTK2
  (not active by default because configure'ing Wireshark still fails for some
  reason with GTK3 installed).

svn path=/trunk/; revision=40352
2011-12-31 16:20:47 +00:00
Michael Tüxen 08a00ee1da Update some support libs to newer version.
svn path=/trunk/; revision=40145
2011-12-10 09:48:59 +00:00
Guy Harris 56903273cc Expand a comment.
svn path=/trunk/; revision=39953
2011-11-20 03:15:53 +00:00
Guy Harris 03194fa270 Move the GeoIP entry where it belongs.
Expand a couple of comments.

svn path=/trunk/; revision=39317
2011-10-08 19:44:36 +00:00
Jörg Mayer 432ca372bd Remove a duplicate entry
svn path=/trunk/; revision=39310
2011-10-08 15:17:56 +00:00
Guy Harris fb162bf95f Xcode 4 isn't available on DVD, but is available for download from
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.

While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.

svn path=/trunk/; revision=38712
2011-08-24 10:18:25 +00:00
Guy Harris 2e2dc7179f Work around an annoying problem caused by the collision of GNU gettext's
configure script's attempts to deal with AIX 4 and Lion and/or Xcode 4's
dealings with Fortify.

svn path=/trunk/; revision=38104
2011-07-19 02:29:31 +00:00
Guy Harris 9659cc77e8 Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".

This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.

svn path=/trunk/; revision=38055
2011-07-15 23:26:22 +00:00
Guy Harris b273aad66e Add Joerg Mayer's macos-setup.sh script, modified to add an "x" after
"macos", to fix some bugs, to use "sudo" if necessary when installing,
to make the library version numbers variables, and to download the
optional libraries, by default, as well.  Also add his patches to make
GLib build and work.

Update README.macos to reflect that.

svn path=/trunk/; revision=38053
2011-07-15 21:48:02 +00:00