(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)
Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp.
Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3.
Lastly, macosx-setup cerates macosx-support-libs directory, which needs
to be ignored.
Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde
Reviewed-on: https://code.wireshark.org/review/360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
To quote
62feb088a3:dist/changes-5.2.1
"****************************************************************************
* Platform Specific Changes
*
****************************************************************************
...
OS X
----
- [QTBUG-34411] Implemented QMainWindow::setUnifiedTitleAndToolBarOnMac."
Also get rid of a commented-out setting of QT_VERSION to 5.1.1 while
we're at it.
Change-Id: I957fdfecb70954723cfd3160f40758f722dc56c8
Reviewed-on: https://code.wireshark.org/review/136
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of
autoconf do so for GCC-compatible compilers (clang is GCC-compatible in
that sense), but only do so when those variables aren't forced.
svn path=/trunk/; revision=52939
set to "qt", "gtk2", or "gtk3".
Work done on a machine with the command-line build tools, but not Full
Frontal Xcode, installed, so it couldn't build Qt, so it hasn't been
tested. It *has* been fixed to complain in that case, rather than
letting the Qt build fail with a somewhat less useful message talking
about Xcode licensing.
svn path=/trunk/; revision=52776
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, check to see
whether we *have* any SDKs and, if not, don't try to find the
appropriate SDK for the release and use it.
svn path=/trunk/; revision=51499
before either of them are tested.
Put the code to get the OS major version number just before we first use
it.
Fix indentation.
svn path=/trunk/; revision=51054
which we're running, so we *always* build against an SDK. (The "10" in
"10.x.y" is not *really* part of the version number, so the "major
version" includes the "10" and the major version number following it.)
svn path=/trunk/; revision=51049
for Leopard. Fix some issues that came up with the older versions.
We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.
When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.
We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.
The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.
svn path=/trunk/; revision=50456
"use your internal version of GLib" flag for pkg-config's configure
script. This simplifies things a little bit.
Fix an indentation error while we're at it.
svn path=/trunk/; revision=50453
shipped with those versions of OS X, and I had some problems with the
newer versions on Snow Leopard (the Makefile was doing weird stuff that
caused build failures in wsutil, moving .Tlo files to .Plo files; I
didn't investigate futher).
svn path=/trunk/; revision=50418
causes a -mmacosx-version-min flag to be used, to keep the compiler and
linker from using features not supported by that OS version, and causes
the support libraries to be built against the SDK for that OS version,
so they don't request library versions later than the one shipped with
that version.
svn path=/trunk/; revision=50402
to run pkg-config to get their values; they should be set equal to the
values that would be returned by pkg-config for libffi with the --cflags
and --libs arguments, respectively. They should *NOT* include the
values of CFLAGS and LDFLAGS supplied in the environment; those should
be handled separately.
svn path=/trunk/; revision=50389
if no make options are given to the macosx-setup.sh script by the user, the
script sets the number of parallel make jobs to 1.5x CPU cores.
Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh
on OsX, so people don't have to remember it.
svn path=/trunk/; revision=50070
actually is (it's not an OS X version number, e.g. 10.7 for Leopard,
it's a Darwin version number, e.g. 9 for Leopard). Add comments before
checks to indicate what we're checking for.
Put in a big long comment giving details about the issues I ran into
when trying to make this work on Leopard.
Fail if you try to run this on anything before Snow Leopard - note that
I said "trying" in the previous comment, and, yes, it was a very trying
experience....
Bump the libpng version - 1.5.12 isn't available any more.
Add some comments explaining why the code for Leopard was downloading
and installing libpng and libpixman.
Add some code to handle packages where older versions weren't compressed
with xz and newer versions were.
Add a hack to avoid finding the version of libpng that comes with X11
when trying to build Cairo on Leopard.
svn path=/trunk/; revision=47206
/usr/include/ffi/fficonfig.h doesn't define MACOSX, which causes the
build of GLib to fail. If we don't find "#define.*MACOSX" in
/usr/include/ffi/fficonfig.h, explictly define it.
svn path=/trunk/; revision=44693
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH. Instead, just don't
request a fat build of PortAudio.
svn path=/trunk/; revision=44457