From: Peter Levine <plevine457@gmail.com>
Date: Tue, 28 Mar 2017 18:16:33 +0000 (-0400)
Subject: dev-vcs/qsvn: Fix building with GCC-6 (bug #613326)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e5d06000c9bd6832251ad879cf21a730ea40feee;p=gentoo.git

dev-vcs/qsvn: Fix building with GCC-6 (bug #613326)

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch b/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch
new file mode 100644
index 000000000000..d4f75fb1e48e
--- /dev/null
+++ b/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/svnqt/contextdata.cpp
++++ b/svnqt/contextdata.cpp
+@@ -748,7 +748,7 @@
+ 
+     svn_config_get(cfg, &mimetypes_file,
+                    SVN_CONFIG_SECTION_MISCELLANY,
+-                   SVN_CONFIG_OPTION_MIMETYPES_FILE, false);
++                   SVN_CONFIG_OPTION_MIMETYPES_FILE, NULL);
+     if (mimetypes_file && *mimetypes_file) {
+         if ((err = svn_io_parse_mimetypes_file(&(m_ctx->mimetypes_map),
+              mimetypes_file, pool))) {
diff --git a/dev-vcs/qsvn/qsvn-0.8.3.ebuild b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
index c48886752301..1dd61f2c2338 100644
--- a/dev-vcs/qsvn/qsvn-0.8.3.ebuild
+++ b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
@@ -27,6 +27,7 @@ S=${WORKDIR}/${P}/src
 PATCHES=(
 	"${FILESDIR}/${P}-static-lib.patch"
 	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
 )
 
 DOCS=( ../ChangeLog ../README )