diff --git a/cppcheck-1.77-gcc7.patch b/cppcheck-1.77-gcc7.patch deleted file mode 100644 index f2a3d70..0000000 --- a/cppcheck-1.77-gcc7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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)); diff --git a/cppcheck.spec b/cppcheck.spec index e1cb09a..0f34949 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck Version: 1.77 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -12,9 +12,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Patch0: cppcheck-1.77-tinyxml.patch # Fix location of translations 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: tinyxml2-devel >= 2.1.0 @@ -44,7 +41,6 @@ This package contains the graphical user interface for cppcheck. %setup -q %patch0 -p1 -b .tinyxml %patch1 -p1 -b .translations -%patch2 -p1 -b .gcc7 # Make sure bundled tinyxml is not used rm -r externals/tinyxml @@ -95,6 +91,10 @@ rm -rf %{buildroot} %changelog +* Mon Feb 27 2017 Mamoru TASAKA - 1.77-4 +- Remove Patch2: fixed in gcc side (gcc-7.0.1-10.fc26) + (ref: bug 1423312) + * Fri Feb 17 2017 Mamoru TASAKA - 1.77-3 - Fix FTBFS with gcc7 (bug 1423312, upstream ticket 7910)