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

Package-Manager: Portage-2.3.5, Repoman-2.3.2
hanetzer · Mar 30, 2017 · e5d0600 · e5d0600
1 parent d5855c0
commit e5d0600
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch 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
@@ -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 )