4 files changed, 24 insertions, 26 deletions
diff --git a/development/cppcheck/README b/development/cppcheck/README
index 634a18c7a5..f9741d43c0 100644
--- a/development/cppcheck/README
+++ b/development/cppcheck/README
@@ -1,13 +1,13 @@
-Cppcheck is an analysis tool for C/C++ code. Unlike C/C++ compilers and many 
-other analysis tools, we don't detect syntax errors.  Cppcheck only detects 
-the types of bugs that the compilers normally fail to detect.  The goal is to
-have no false positives. 
+Cppcheck is a static analysis tool for C/C++ code. Unlike C/C++ compilers
+and many other analysis tools, it doesn't detect syntax errors.  Cppcheck
+only detects the types of bugs that the compilers normally fail to detect.
+The goal is to have no false positives.
 
-To supplement Cppcheck, it is recommended that you enable as many compiler 
-warnings as possible.  For the GCC compiler, take a look at 
-http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html for a comprehensive 
-list of warning options that GCC supports.  At a minimum, it is recommended 
-that you enable -Wall, -Wextra, and -pedantic 
+To supplement Cppcheck, it is recommended that you enable as many
+compiler warnings as possible.  For the GCC compiler, take a look
+at http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html for a
+comprehensive list of warning options that GCC supports.  At a minimum,
+it is recommended that you enable -Wall, -Wextra, and -pedantic
 
-If you do not want to install the manual pages, you can run the build script
-like this:  MAKEMAN=no ./cppcheck.SlackBuild
+If you do not want to install the manual pages, you can run the build
+script like this:  MAKEMAN=no ./cppcheck.SlackBuild
diff --git a/development/cppcheck/cppcheck.SlackBuild b/development/cppcheck/cppcheck.SlackBuild
index c0eea95ae7..a0c5d43485 100644
--- a/development/cppcheck/cppcheck.SlackBuild
+++ b/development/cppcheck/cppcheck.SlackBuild
@@ -23,18 +23,16 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cppcheck
-VERSION=${VERSION:-1.40}
+VERSION=${VERSION:-1.46}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 MAKEMAN=${MAKEMAN:-yes}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,8 +52,8 @@ elif [ "$ARCH" = "x86_64" ]; then
    SLKCFLAGS="-O2 -fPIC"
    LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+   SLKCFLAGS="-O2"
+   LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -67,8 +65,8 @@ cd $PRGNAM-$VERSION
 chown root:root . -R
 
 make \
-  CFLAGS="$SLKCFLAGS -Wall -Wextra -pedantic -DNDEBUG" \
-  CXXFLAGS="$SLKCFLAGS -Wall -Wextra -pedantic -DNDEBUG"
+  CFLAGS="$SLKCFLAGS -Wall -Wextra -pedantic -Wno-long-long -DNDEBUG" \
+  CXXFLAGS="$SLKCFLAGS -Wall -Wextra -pedantic -Wno-long-long -DNDEBUG"
 make install DESTDIR=$PKG
 
 if [ x"$MAKEMAN" == "xyes" ]; then
diff --git a/development/cppcheck/cppcheck.info b/development/cppcheck/cppcheck.info
index 8a0cdae8bf..6284109a72 100644
--- a/development/cppcheck/cppcheck.info
+++ b/development/cppcheck/cppcheck.info
@@ -1,10 +1,10 @@
 PRGNAM="cppcheck"
-VERSION="1.40"
+VERSION="1.46"
 HOMEPAGE="http://cppcheck.wiki.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/cppcheck/cppcheck/1.40/cppcheck-1.40.tar.gz"
-MD5SUM="1ef320edb92213b5f24df8f0e21ceeac"
+DOWNLOAD="http://downloads.sourceforge.net/cppcheck/cppcheck-1.46.tar.gz"
+MD5SUM="61be721298d975f589e2b82bc038141c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Sean Donner"
 EMAIL="sean.donner@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/development/cppcheck/slack-desc b/development/cppcheck/slack-desc
index 2a0197ce1a..6e605a72bb 100644
--- a/development/cppcheck/slack-desc
+++ b/development/cppcheck/slack-desc
@@ -8,10 +8,10 @@
         |-----handy-ruler------------------------------------------------------|
 cppcheck: Cppcheck (A tool for static C/C++ code analysis)
 cppcheck:
-cppcheck: Cppcheck is an analysis tool for C/C++ code. Unlike C/C++ compilers
-cppcheck: and many other analysis tools, we don't detect syntax errors. Cppcheck
-cppcheck: only detects the types of bugs that the compilers normally fail to
-cppcheck: detect. The goal is no false positives. 
+cppcheck: Cppcheck is a static analysis tool for C/C++ code. Unlike C/C++
+cppcheck: compilers and many other analysis tools, it doesn't detect syntax
+cppcheck: errors. Cppcheck only detects the types of bugs that the compilers
+cppcheck: normally fail to detect. The goal is no false positives.
 cppcheck:
 cppcheck:
 cppcheck: