[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.16-48-g9b1053c

[Eric S. Raymond]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GPSD".

The branch, master has been updated
       via  9b1053c3eb1968542e87cf7f5619e91df5320fa1 (commit)
       via  389ad5707da955706f171ae1940ac48d08fc6fe3 (commit)
      from  85bb6ad9eebb139a16265ab2d775b10df15d9b04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b1053c3eb1968542e87cf7f5619e91df5320fa1
Author: Fred Wright <address@hidden>
Date:   Tue Feb 9 17:17:06 2016 -0800

    Fixes build for OSX 10.4.
    
    This is a modified version of address@hidden's patch,
    originally applied to 3.14 and brought forward to 3.15/3.16.  The
    original patch attempted to handle earlier OSX versions as well, but
    that was obviously untested, since the 10.3 version of the define is
    actually _TIMESPEC_DECLARED, not _TIMESPEC_DEFINED (though MacPorts
    doesn't support anything older than 10.4, anyway).  It turns out that
    building for 10.3 is broken for other reasons, but this patch should
    at least fix this particular problem for 10.3 (and earlier?) as well
    as 10.4.
    
    Aside from expanding the #ifndef, this adds a #define _STRUCT_TIMESPEC
    inside the conditional, for consistency with other such usage, even
    though it's unlikely that these particular headers will be included
    multiple times.
    
    TESTED:
    Verified that building for OSX 10.4 fails without this patch, and
    succeeds with it.  Also tested builds for 10.5 and 10.9 (both x86 and
    PPC in the former case), as well as Linux and xxxBSD builds.  Ran
    regression tests in all cases except the failing 10.4 case.

commit 389ad5707da955706f171ae1940ac48d08fc6fe3
Author: Fred Wright <address@hidden>
Date:   Tue Feb 9 17:17:04 2016 -0800

    Adds SConstruct option to support versioned Qt libraries.
    
    As of Qt5, the Qt library names have the major version number
    built into the library names (e.g. Qt5Network).  This change
    adds a new "qt_versioned" option which can be used to pass the
    proper version number into the appropriate commands.  The default
    value is null, which is compatible with the unversioned naming used
    in Qt4.
    
    This change also makes the CheckPKG call for the Qt library
    conditional on Qt support being enabled.  Aside from avoiding a
    useless pkg-config invocation in the non-Qt case, this also makes
    it possible to distinguish between explictly and implicitly disabled
    Qt support in the build output.
    
    TESTED:
    Builds without Qt and with Qt4 have been successfully performed under
    all OSX versions from 10.5 through 10.11.  Builds with Qt5 have
    been successfully performed under OSX versions from 10.8 (the earliest
    version officially supported by Qt5) through 10.11.

-----------------------------------------------------------------------

Summary of changes:
 SConstruct |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GPSD