Merge pull request #9982 from Chocobo1/fixes

Fix TravisCI linux builds

.travis.yml

@@ -39,8 +39,6 @@ cache:
 
 # opt-in Ubuntu Trusty
 dist: trusty
-# container-based builds
-sudo: false
 
 addons:
   coverity_scan:
@@ -67,20 +65,21 @@ addons:
       - [libboost-dev, libboost-system-dev]
       - libtorrent-rasterbar-dev
       - [qt55base, qt55svg, qt55tools]
-      - [gcc-6, g++-6]
+      - [gcc-5, g++-5]
 
 before_install:
   # only allow specific build for coverity scan, others will stop
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
 
   - shopt -s expand_aliases
-  - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
+  - alias make="colormake -j2" # Using nprocs/2 sometimes may fail (gcc is killed by system)
   - qbt_path="$HOME/qbt_install"
   - |
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
     else
       qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+      CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs -Wno-inconsistent-missing-override"
     fi
 
   # options for specific branches
@@ -93,10 +92,7 @@ before_install:
       # Qt 5
       PATH=/opt/qt55/bin:${PATH}
 
-      if [ "$build_system" = "cmake" ]; then
-          COMPILER_VERSION=6
-          export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
-      fi
+      export CXX="${CXX}-5" CC="${CC}-5"
     fi
 
   # print settings
@@ -156,18 +152,7 @@ script:
       BUILD_TOOL="ninja"
     fi
     if [ "$build_system" = "qmake" ]; then
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        # For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
-        # Homebrew doesn't symlink OpenSSL for security reasons
-        ./bootstrap.sh
-        ./configure $qbtconf CXXFLAGS="$CXXFLAGS -std=c++14"
-
-        sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile  # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
-        sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
-        sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
-      else
-        ./bootstrap.sh && ./configure $qbtconf
-      fi
+      ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$CXXFLAGS"
       BUILD_TOOL="make"
     fi
   - $BUILD_TOOL && $BUILD_TOOL install

conf.pri.in

@@ -5,6 +5,8 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
+QMAKE_CC = @QBT_CC@
+QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@

configure

@@ -595,6 +595,8 @@ QBT_REMOVE_CONFIG
 QBT_ADD_CONFIG
 QBT_CONF_EXTRA_CFLAGS
 QBT_CONF_INCLUDES
+QBT_CXX
+QBT_CC
 EXPAND_MANDIR
 EXPAND_DATADIR
 EXPAND_BINDIR
@@ -4178,6 +4180,10 @@ END
 fi
 
 
+# use compiler from env variables if available
+QBT_CC="$CC"
+QBT_CXX="$CXX"
+
 # Define --wth-* and --enable-* arguments
 
 
@@ -5795,6 +5801,8 @@ QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 
 
+
+
 ac_config_files="$ac_config_files conf.pri"
 
 cat >confcache <<\_ACEOF

configure.ac

@@ -8,6 +8,10 @@ AC_LANG(C++)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
+# use compiler from env variables if available
+QBT_CC="$CC"
+QBT_CXX="$CXX"
+
 # Define --wth-* and --enable-* arguments
 
 AC_ARG_WITH(qtsingleapplication,
@@ -275,6 +279,8 @@ extract "$CFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 # Substitute the values of these vars in conf.pri.in
+AC_SUBST(QBT_CC)
+AC_SUBST(QBT_CXX)
 AC_SUBST(QBT_CONF_INCLUDES)
 AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
 AC_SUBST(QBT_ADD_CONFIG)

src/base/net/geoipmanager.cpp

@@ -435,8 +435,9 @@ void GeoIPManager::downloadFinished(const QString &url, QByteArray data)
             if (m_geoIPDatabase)
                 delete m_geoIPDatabase;
             m_geoIPDatabase = geoIPDatabase;
+            const QLocale locale {Preferences::instance()->getLocale()};
             Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.")
-                .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()),
+                .arg(m_geoIPDatabase->type(), locale.toString(m_geoIPDatabase->buildEpoch())),
                 Log::INFO);
             QString targetPath = Utils::Fs::expandPathAbs(
                         specialFolderLocation(SpecialFolder::Data) + GEOIP_FOLDER);

src/base/utils/password.cpp

@@ -78,16 +78,16 @@ QByteArray Utils::Password::PBKDF2::generate(const QByteArray &password)
 
     std::array<unsigned char, 64> outBuf {};
     const int hmacResult = PKCS5_PBKDF2_HMAC(password.constData(), password.size()
-        , reinterpret_cast<const unsigned char *>(salt.data()), (sizeof(salt[0]) * salt.size())
+        , reinterpret_cast<const unsigned char *>(salt.data()), static_cast<int>(sizeof(salt[0]) * salt.size())
         , hashIterations, hashMethod
-        , outBuf.size(), outBuf.data());
+        , static_cast<int>(outBuf.size()), outBuf.data());
     if (hmacResult != 1)
         return {};
 
     const QByteArray saltView = QByteArray::fromRawData(
-        reinterpret_cast<const char *>(salt.data()), (sizeof(salt[0]) * salt.size()));
+        reinterpret_cast<const char *>(salt.data()), static_cast<int>(sizeof(salt[0]) * salt.size()));
     const QByteArray outBufView = QByteArray::fromRawData(
-        reinterpret_cast<const char *>(outBuf.data()), outBuf.size());
+        reinterpret_cast<const char *>(outBuf.data()), static_cast<int>(outBuf.size()));
 
     return (saltView.toBase64() + ':' + outBufView.toBase64());
 }
@@ -110,11 +110,11 @@ bool Utils::Password::PBKDF2::verify(const QByteArray &secret, const QByteArray
     const int hmacResult = PKCS5_PBKDF2_HMAC(password.constData(), password.size()
         , reinterpret_cast<const unsigned char *>(salt.constData()), salt.size()
         , hashIterations, hashMethod
-        , outBuf.size(), outBuf.data());
+        , static_cast<int>(outBuf.size()), outBuf.data());
     if (hmacResult != 1)
         return false;
 
     const QByteArray outBufView = QByteArray::fromRawData(
-        reinterpret_cast<const char *>(outBuf.data()), outBuf.size());
+        reinterpret_cast<const char *>(outBuf.data()), static_cast<int>(outBuf.size()));
     return slowEquals(key, outBufView);
 }