| 1 |
commit: e5d06000c9bd6832251ad879cf21a730ea40feee |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Mar 28 18:16:33 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 30 07:47:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d06000 |
| 7 |
|
| 8 |
dev-vcs/qsvn: Fix building with GCC-6 (bug #613326) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch | 11 +++++++++++ |
| 13 |
dev-vcs/qsvn/qsvn-0.8.3.ebuild | 1 + |
| 14 |
2 files changed, 12 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch b/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..d4f75fb1e48 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-vcs/qsvn/files/qsvn-0.8.3-gcc6.patch |
| 21 |
@@ -0,0 +1,11 @@ |
| 22 |
+--- a/svnqt/contextdata.cpp |
| 23 |
++++ b/svnqt/contextdata.cpp |
| 24 |
+@@ -748,7 +748,7 @@ |
| 25 |
+ |
| 26 |
+ svn_config_get(cfg, &mimetypes_file, |
| 27 |
+ SVN_CONFIG_SECTION_MISCELLANY, |
| 28 |
+- SVN_CONFIG_OPTION_MIMETYPES_FILE, false); |
| 29 |
++ SVN_CONFIG_OPTION_MIMETYPES_FILE, NULL); |
| 30 |
+ if (mimetypes_file && *mimetypes_file) { |
| 31 |
+ if ((err = svn_io_parse_mimetypes_file(&(m_ctx->mimetypes_map), |
| 32 |
+ mimetypes_file, pool))) { |
| 33 |
|
| 34 |
diff --git a/dev-vcs/qsvn/qsvn-0.8.3.ebuild b/dev-vcs/qsvn/qsvn-0.8.3.ebuild |
| 35 |
index c4888675230..1dd61f2c233 100644 |
| 36 |
--- a/dev-vcs/qsvn/qsvn-0.8.3.ebuild |
| 37 |
+++ b/dev-vcs/qsvn/qsvn-0.8.3.ebuild |
| 38 |
@@ -27,6 +27,7 @@ S=${WORKDIR}/${P}/src |
| 39 |
PATCHES=( |
| 40 |
"${FILESDIR}/${P}-static-lib.patch" |
| 41 |
"${FILESDIR}/${P}-tests.patch" |
| 42 |
+ "${FILESDIR}/${P}-gcc6.patch" |
| 43 |
) |
| 44 |
|
| 45 |
DOCS=( ../ChangeLog ../README ) |
Archives