summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-03-28 14:16:33 -0400
committerMichael Palimaka <kensington@gentoo.org>2017-03-30 18:47:57 +1100
commite5d06000c9bd6832251ad879cf21a730ea40feee (patch)
tree005365084f8bcbe5b6d392ec8d742e455a725897 /dev-vcs
parentwww-client/surf: Depend on net-libs/webkit-gtk:4 (bug #584190). (diff)
downloadgentoo-e5d06000c9bd6832251ad879cf21a730ea40feee.tar.gz
gentoo-e5d06000c9bd6832251ad879cf21a730ea40feee.tar.bz2
gentoo-e5d06000c9bd6832251ad879cf21a730ea40feee.zip
dev-vcs/qsvn: Fix building with GCC-6 (bug #613326)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch11
-rw-r--r--dev-vcs/qsvn/qsvn-0.8.3.ebuild1
2 files changed, 12 insertions, 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
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 )