rpms/cppcheck
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS with gcc7 (bug 1423312, upstream ticket 7910)

Browse Source
This commit is contained in:
Mamoru TASAKA 2017-02-17 13:14:31 +09:00
parent e08af060ab
commit 8f5d6bebaf
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cppcheck-1.77-gcc7.patch Normal file
View File

@ -0,0 +1,20 @@
--- cppcheck-1.76.1.orig/gui/librarydialog.cpp
+++ cppcheck-1.76.1/gui/librarydialog.cpp
@@ -96,7 +96,7 @@ void LibraryDialog::openCfg()
ui->buttonSaveAs->setEnabled(true);
ui->filter->clear();
ui->functions->clear();
- for (struct CppcheckLibraryData::Function &function : data.functions) {
+ for (CppcheckLibraryData::Function &function : data.functions) {
ui->functions->addItem(new FunctionListItem(ui->functions,
&function,
false));
@@ -246,7 +246,7 @@ void LibraryDialog::sortFunctions(bool s
ignoreChanges = true;
CppcheckLibraryData::Function *selfunction = currentFunction();
ui->functions->clear();
- for (struct CppcheckLibraryData::Function &function : data.functions) {
+ for (CppcheckLibraryData::Function &function : data.functions) {
ui->functions->addItem(new FunctionListItem(ui->functions,
&function,
selfunction == &function));

9
cppcheck.spec
View File

@ -1,6 +1,6 @@
Name: cppcheck Name: cppcheck
Version: 1.77 Version: 1.77
Release: 2%{?dist} Release: 3%{?dist}
Summary: Tool for static C/C++ code analysis Summary: Tool for static C/C++ code analysis
Group: Development/Languages Group: Development/Languages
License: GPLv3+ License: GPLv3+
@ -12,6 +12,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch0: cppcheck-1.77-tinyxml.patch Patch0: cppcheck-1.77-tinyxml.patch
# Fix location of translations # Fix location of translations
Patch1: cppcheck-1.77-translations.patch Patch1: cppcheck-1.77-translations.patch
# http://trac.cppcheck.net/ticket/7910
# Patch not committed into repository yet, pulled from the above ticket
Patch2: cppcheck-1.77-gcc7.patch
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: tinyxml2-devel >= 2.1.0 BuildRequires: tinyxml2-devel >= 2.1.0
@ -41,6 +44,7 @@ This package contains the graphical user interface for cppcheck.
%setup -q %setup -q
%patch0 -p1 -b .tinyxml %patch0 -p1 -b .tinyxml
%patch1 -p1 -b .translations %patch1 -p1 -b .translations
%patch2 -p1 -b .gcc7
# Make sure bundled tinyxml is not used # Make sure bundled tinyxml is not used
rm -r externals/tinyxml rm -r externals/tinyxml
@ -91,6 +95,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Feb 17 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.77-3
- Fix FTBFS with gcc7 (bug 1423312, upstream ticket 7910)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-2 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild