[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/

[Sergei Trofimovich]

commit:     1eda689fed1aff69fbfba595a81195b942da56d2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 06:44:25 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 06:46:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eda689f

dev-util/cppcheck: refresh tinyxml2 patch for live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/cppcheck/cppcheck-9999.ebuild             |  2 +-
 .../cppcheck/files/cppcheck-9999-tinyxml2.patch    | 56 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild 
b/dev-util/cppcheck/cppcheck-9999.ebuild
index 4eb9053d431..9ebb17a4dbd 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
 "
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+       "${FILESDIR}"/${PN}-9999-tinyxml2.patch
 )
 
 src_prepare() {

diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch 
b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
new file mode 100644
index 00000000000..7a2a037ab37
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
@@ -0,0 +1,56 @@
+--- a/externals/externals.pri
++++ b/externals/externals.pri
+@@ -1,9 +1,6 @@
+ INCLUDEPATH += $${PWD} \
+-               $${PWD}/simplecpp \
+-               $${PWD}/tinyxml
++               $${PWD}/simplecpp
+ 
+-HEADERS += $${PWD}/simplecpp/simplecpp.h \
+-           $${PWD}/tinyxml/tinyxml2.h
++HEADERS += $${PWD}/simplecpp/simplecpp.h
+ 
+-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
+-           $${PWD}/tinyxml/tinyxml2.cpp
++SOURCES += $${PWD}/simplecpp/simplecpp.cpp
+--- a/gui/gui.pro
++++ b/gui/gui.pro
+@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+ LIBS += -L$$PWD/../externals
++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
+ 
+ DESTDIR = .
+ RCC_DIR = temp
+--- a/tools/dmake.cpp
++++ b/tools/dmake.cpp
+@@ -122,7 +122,6 @@ int main(int argc, char **argv)
+ 
+     std::vector<std::string> extfiles;
+     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
+-    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
+ 
+     std::vector<std::string> clifiles;
+     getCppFiles(clifiles, "cli/", false);
+@@ -171,7 +170,6 @@ int main(int argc, char **argv)
+         std::ofstream fout1("test/testfiles.pri");
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by 
dmake\n\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "\n\nSOURCES += ";
+             for (unsigned int i = 0; i < testfiles.size(); ++i) {
+                 const std::string filename(testfiles[i].substr(5));
+@@ -335,9 +333,9 @@ int main(int argc, char **argv)
+          << "endif\n\n";
+ 
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem 
externals -isystem externals/simplecpp -isystem externals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem 
externals/simplecpp -isystem externals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem 
externals/simplecpp -isystem externals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem 
externals -isystem externals/simplecpp");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem 
externals/simplecpp");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem 
externals/simplecpp");
+ 
+     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl 
docbook-xml on Linux\n";