From 1b0e95aaa5a9b253379330c62c4b83d9379fe451 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 29 Aug 2015 16:47:49 +0200 Subject: [PATCH] cppcheck: fix musl. --- srcpkgs/cppcheck/patches/avoid_execinfo.patch | 11 ++++++++++ srcpkgs/cppcheck/patches/set_datadir.patch | 21 +++++++++++++++++++ srcpkgs/cppcheck/template | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cppcheck/patches/avoid_execinfo.patch create mode 100644 srcpkgs/cppcheck/patches/set_datadir.patch diff --git a/srcpkgs/cppcheck/patches/avoid_execinfo.patch b/srcpkgs/cppcheck/patches/avoid_execinfo.patch new file mode 100644 index 0000000000..70d177756d --- /dev/null +++ b/srcpkgs/cppcheck/patches/avoid_execinfo.patch @@ -0,0 +1,11 @@ +--- cli/cppcheckexecutor.cpp.orig ++++ cli/cppcheckexecutor.cpp +@@ -51,7 +51,7 @@ + #endif + #endif + +-#if !defined(NO_UNIX_BACKTRACE_SUPPORT) && defined(USE_UNIX_SIGNAL_HANDLING) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__SVR4) && !defined(__QNX__) ++#if !defined(NO_UNIX_BACKTRACE_SUPPORT) && defined(USE_UNIX_SIGNAL_HANDLING) && defined (__GLIBC__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__SVR4) && !defined(__QNX__) + #define USE_UNIX_BACKTRACE_SUPPORT + #include + #include diff --git a/srcpkgs/cppcheck/patches/set_datadir.patch b/srcpkgs/cppcheck/patches/set_datadir.patch new file mode 100644 index 0000000000..f353d4e562 --- /dev/null +++ b/srcpkgs/cppcheck/patches/set_datadir.patch @@ -0,0 +1,21 @@ +--- gui/main.cpp.orig ++++ gui/main.cpp +@@ -57,12 +57,18 @@ + QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app); + + // Set data dir.. ++ if ((settings->value("DATADIR", QString()).toString()).isEmpty()) ++ settings->setValue("DATADIR", "/usr/share/cppcheck"); ++ + foreach(const QString arg, app.arguments()) { + if (arg.startsWith("--data-dir=")) { + settings->setValue("DATADIR", arg.mid(11)); + return 0; + } + } ++ ++ if ((settings->value(SETTINGS_LANGUAGE, QString()).toString()).isEmpty()) ++ settings->setValue(SETTINGS_LANGUAGE, "en"); + + TranslationHandler* th = new TranslationHandler(&app); + th->SetLanguage(settings->value(SETTINGS_LANGUAGE, th->SuggestLanguage()).toString()); diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index cbad5d50b4..1aa2587345 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,7 +1,7 @@ # Template file for 'cppcheck' pkgname=cppcheck version=1.69 -revision=2 +revision=3 hostmakedepends="libxslt docbook-xsl" short_desc="Static analysis of C/C++ code" maintainer="Juan RP "