From: Jan Rękorajski Date: Sun, 15 Nov 2015 18:26:11 +0000 (+0100) Subject: - updated to 1.71 X-Git-Tag: auto/th/cppcheck-1.71-1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4338603d5111fc1ab794caef7e24c56f18686622;hp=a7aee4601b15418bb53bb71f2c1ddd43de3f37c9;p=packages%2Fcppcheck.git - updated to 1.71 --- diff --git a/cppcheck-gui-paths.patch b/cppcheck-gui-paths.patch index 2665b77..7623c23 100644 --- a/cppcheck-gui-paths.patch +++ b/cppcheck-gui-paths.patch @@ -6,6 +6,6 @@ info.mName = name; - info.mFilename = filename; + info.mFilename = QString("/usr/share/cppcheck-gui/") + filename; - info.mCode = QString(filename).right(2); + int codeLength = QString(filename).length() - QString(filename).indexOf('_') - 1; + info.mCode = QString(filename).right(codeLength); mTranslations.append(info); - } diff --git a/cppcheck-translations.patch b/cppcheck-translations.patch new file mode 100644 index 0000000..cfbbd49 --- /dev/null +++ b/cppcheck-translations.patch @@ -0,0 +1,32 @@ +diff -up cppcheck-1.70/gui/CMakeLists.txt.translations cppcheck-1.70/gui/CMakeLists.txt +--- cppcheck-1.70/gui/CMakeLists.txt.translations 2015-11-05 11:37:19.343945331 -0800 ++++ cppcheck-1.70/gui/CMakeLists.txt 2015-11-05 11:37:19.344945349 -0800 +@@ -26,7 +26,7 @@ if (BUILD_GUI) + add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms}) + + install(TARGETS cppcheck-gui RUNTIME DESTINATION bin COMPONENT applications) +- install(FILES ${qms} DESTINATION bin COMPONENT applications) ++ install(FILES ${qms} DESTINATION share/${PROJECT_NAME}/lang/ COMPONENT applications) + + set(CMAKE_AUTOMOC OFF) + +diff -up cppcheck-1.70/gui/translationhandler.cpp.translations cppcheck-1.70/gui/translationhandler.cpp +--- cppcheck-1.70/gui/translationhandler.cpp.translations 2015-09-04 11:04:31.000000000 -0700 ++++ cppcheck-1.70/gui/translationhandler.cpp 2015-11-05 11:38:34.991299374 -0800 +@@ -106,15 +106,7 @@ bool TranslationHandler::SetLanguage(con + if (datadir.isEmpty()) + datadir = appPath; + +- QString translationFile; +- if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm")) +- translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm"; +- +- else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm")) +- translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm"; +- +- else +- translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm"; ++ QString translationFile("/usr/share/CppCheck/lang/" + mTranslations[index].mFilename + ".qm"); + + if (!mTranslator->load(translationFile) && !failure) { + translationFile += ".qm"; diff --git a/cppcheck.spec b/cppcheck.spec index 06c1d71..76b02c6 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -5,13 +5,14 @@ Summary: Tool for static C/C++ code analysis Summary(pl.UTF-8): Narzędzie do statycznej analizy kodu w C/C++ Name: cppcheck -Version: 1.51 -Release: 2 +Version: 1.71 +Release: 1 License: GPL v3+ Group: Development/Tools Source0: http://downloads.sourceforge.net/cppcheck/%{name}-%{version}.tar.bz2 -# Source0-md5: 8349ab90472801b9d377cfabf846ca28 +# Source0-md5: e8400409101e60d81cc10418744f8b29 Patch0: %{name}-gui-paths.patch +Patch1: %{name}-translations.patch URL: http://cppcheck.sourceforge.net/ BuildRequires: cmake BuildRequires: docbook-style-xsl @@ -58,73 +59,62 @@ Oparty na Qt4 graficzny interfejs użytkownika do cppcheck. %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__sed} -i -e 's,-I[^ ]*/externals,,g' lib/lib.pri %build -%{__make} all man \ - CXX="%{__cxx}" \ - CXXFLAGS="%{rpmcxxflags} -DNDEBUG -DHAVE_RULES -DTIXML_USE_STL -Wall" \ - INCLUDE_FOR_CLI="-Ilib" \ - INCLUDE_FOR_TEST="-Ilib -Icli" \ - LDFLAGS="%{rpmldflags} -lpcre" \ - TINYXML="%{_libdir}/libtinyxml.so" \ - DB2MAN=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl +%{__make} DB2MAN=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl man + +mkdir build +cd build +%{cmake} \ + ../ \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILD_GUI:BOOL=%{?with_gui:ON}%{!?with_gui:OFF} \ + -DHAVE_RULES:BOOL=ON + -%if %{with gui} -cd gui -qmake-qt4 \ - QMAKE_CXX="%{__cxx}" \ - QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \ - QMAKE_LFLAGS_RELEASE="%{rpmldflags}" %{__make} -lrelease-qt4 cppcheck_*.ts -# compiled version not used yet (code refers to manual.html at sf.net) -#cd help -#%{_libdir}/qt4/bin/qcollectiongenerator online-help.qhcp -o online-help.qhc -%endif %install rm -rf $RPM_BUILD_ROOT +cd build %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - TINYXML="%{_libdir}/libtinyxml.so" + DESTDIR=$RPM_BUILD_ROOT -install -Dp cppcheck.1 $RPM_BUILD_ROOT%{_mandir}/man1/cppcheck.1 +install -Dp ../cppcheck.1 $RPM_BUILD_ROOT%{_mandir}/man1/cppcheck.1 -%if %{with gui} -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cppcheck-gui} -install gui/cppcheck-gui $RPM_BUILD_ROOT%{_bindir} -install -p gui/cppcheck_*.qm $RPM_BUILD_ROOT%{_datadir}/cppcheck-gui -%{__make} -C gui install \ - DESTDIR=$RPM_BUILD_ROOT -%endif +%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/CppCheck +%{__rm} -r $RPM_BUILD_ROOT/usr/lib/lib*.a %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS Changelog readme.txt +%doc AUTHORS readme.txt %attr(755,root,root) %{_bindir}/cppcheck %{_mandir}/man1/cppcheck.1* %if %{with gui} %files gui %defattr(644,root,root,755) -%doc readme_gui.txt %attr(755,root,root) %{_bindir}/cppcheck-gui -%dir %{_datadir}/cppcheck-gui -%lang(de) %{_datadir}/cppcheck-gui/cppcheck_de.qm -%{_datadir}/cppcheck-gui/cppcheck_en.qm -%lang(es) %{_datadir}/cppcheck-gui/cppcheck_es.qm -%lang(fi) %{_datadir}/cppcheck-gui/cppcheck_fi.qm -%lang(fr) %{_datadir}/cppcheck-gui/cppcheck_fr.qm -%lang(ja) %{_datadir}/cppcheck-gui/cppcheck_ja.qm -%lang(nl) %{_datadir}/cppcheck-gui/cppcheck_nl.qm -%lang(pl) %{_datadir}/cppcheck-gui/cppcheck_pl.qm -%lang(ru) %{_datadir}/cppcheck-gui/cppcheck_ru.qm -%lang(sr) %{_datadir}/cppcheck-gui/cppcheck_sr.qm -%lang(sv) %{_datadir}/cppcheck-gui/cppcheck_sv.qm +%dir %{_datadir}/CppCheck +%{_datadir}/CppCheck/*.cfg +%dir %{_datadir}/CppCheck/lang +%lang(de) %{_datadir}/CppCheck/lang/cppcheck_de.qm +%lang(es) %{_datadir}/CppCheck/lang/cppcheck_es.qm +%lang(fi) %{_datadir}/CppCheck/lang/cppcheck_fi.qm +%lang(fr) %{_datadir}/CppCheck/lang/cppcheck_fr.qm +%lang(it) %{_datadir}/CppCheck/lang/cppcheck_it.qm +%lang(ja) %{_datadir}/CppCheck/lang/cppcheck_ja.qm +%lang(ko) %{_datadir}/CppCheck/lang/cppcheck_ko.qm +%lang(nl) %{_datadir}/CppCheck/lang/cppcheck_nl.qm +%lang(ru) %{_datadir}/CppCheck/lang/cppcheck_ru.qm +%lang(sr) %{_datadir}/CppCheck/lang/cppcheck_sr.qm +%lang(sv) %{_datadir}/CppCheck/lang/cppcheck_sv.qm +%lang(zh_CN) %{_datadir}/CppCheck/lang/cppcheck_zh_CN.qm %endif