development/qt-creator: Updated for version 4.9.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 23 insertions, 6 deletions

diff --git a/development/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild
index f7def375d8..e088f2281f 100644
--- a/development/qt-creator/qt-creator.SlackBuild
+++ b/development/qt-creator/qt-creator.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Qt Creator
 
 # Copyright 2016 Andre Barboza, Belo Horizonte - Brazil
-# Copyright 2018 Andrzej Telszewski, Szczecin
+# Copyright 2019 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 # VERSION=4.2.0_rc1 or VERSION=4.2.0_beta1 (note the underscore).
 
 PRGNAM=qt-creator
-VERSION=${VERSION:-4.6.2}
+VERSION=${VERSION:-4.9.2}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -83,6 +83,7 @@ sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" src/plugins/coreplugin/ico
 # LLVM/Clang can be used to extend Qt Creator functionality.
 if [ "${USE_LLVM:-no}" = yes -o "${CODE_MODEL:-no}" = "yes" ]; then
   LLVM_INSTALL_ROOT=/usr/libexec/qtcreator/clang
+  QMAKE_LFLAGS=-L${LLVM_INSTALL_ROOT}/lib
 
   if [ ! -x $LLVM_INSTALL_ROOT/bin/clang ]; then
     echo "error: You must install \"qt-creator-llvm\" package in order to"
@@ -91,8 +92,14 @@ if [ "${USE_LLVM:-no}" = yes -o "${CODE_MODEL:-no}" = "yes" ]; then
   fi
 fi
 
-qmake-qt5 qtcreator.pro \
+patch -p0 < $CWD/remove-w-error-unguarded-availability-new.patch
+
+# Fix for https://lists.qt-project.org/pipermail/qt-creator/2019-May/008050.html
+QMAKE_LFLAGS="$QMAKE_LFLAGS -L/usr/lib$LIBDIRSUFFIX"
+
+qmake-qt5 -r qtcreator.pro \
   QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  QMAKE_LFLAGS="$QMAKE_LFLAGS" \
   QTC_PREFIX=/usr \
   IDE_LIBRARY_BASENAME=lib$LIBDIRSUFFIX \
   LLVM_INSTALL_DIR=$LLVM_INSTALL_ROOT \
diff --git a/development/qt-creator/qt-creator.info b/development/qt-creator/qt-creator.info
index abae80d2a7..34613ce23d 100644
--- a/development/qt-creator/qt-creator.info
+++ b/development/qt-creator/qt-creator.info
@@ -1,8 +1,8 @@
 PRGNAM="qt-creator"
-VERSION="4.6.2"
+VERSION="4.9.2"
 HOMEPAGE="https://wiki.qt.io/Qt_Creator"
-DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.6/4.6.2/qt-creator-opensource-src-4.6.2.tar.gz"
-MD5SUM="d1feebef18525a769c1745528e736466"
+DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.9/4.9.2/qt-creator-opensource-src-4.9.2.tar.gz"
+MD5SUM="c226740c66cb7cb231180d4cbe572cbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qbs"
diff --git a/development/qt-creator/remove-w-error-unguarded-availability-new.patch b/development/qt-creator/remove-w-error-unguarded-availability-new.patch
new file mode 100644
index 0000000000..7794cce51c
--- /dev/null
+++ b/development/qt-creator/remove-w-error-unguarded-availability-new.patch
@@ -0,0 +1,10 @@
+--- src/shared/clang/clang_installation.pri.orig	2018-09-18 10:30:26.000000000 +0200
++++ src/shared/clang/clang_installation.pri	2018-09-25 20:25:05.873974281 +0200
+@@ -180,6 +180,7 @@
+     LLVM_CXXFLAGS ~= s,-fPIC,
+     LLVM_CXXFLAGS ~= s,-pedantic,
+     LLVM_CXXFLAGS ~= s,-Wstring-conversion,
++    LLVM_CXXFLAGS ~= s,-Werror=unguarded-availability-new,
+     # split-dwarf needs objcopy which does not work via icecc out-of-the-box
+     LLVM_CXXFLAGS ~= s,-gsplit-dwarf,
+