commit: 94454a54314e0b471877ee2d1b44d8a6b9128cea Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Apr 9 19:30:02 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Apr 9 19:30:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94454a54
dev-vcs/subversion: fix building against >=dev-libs/apr-1.7.0 Closes: https://bugs.gentoo.org/682786 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../files/subversion-1.11.1-allow-apr-1.7.0+.patch | 18 ++++++++++++++++++ dev-vcs/subversion/subversion-1.10.4.ebuild | 4 ++++ dev-vcs/subversion/subversion-1.11.1.ebuild | 4 ++++ dev-vcs/subversion/subversion-1.12.0_rc1.ebuild | 4 ++++ dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 4 ++++ 5 files changed, 34 insertions(+) diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch new file mode 100644 index 00000000000..a0da4a5931d --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch @@ -0,0 +1,18 @@ +--- a/build/ac-macros/swig.m4 ++++ b/build/ac-macros/swig.m4 +@@ -137,13 +137,13 @@ + AC_CACHE_CHECK([for apr_int64_t Python/C API format string], + [svn_cv_pycfmt_apr_int64_t], [ + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], ++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="L"]) + fi + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r ++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="l"]) diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild index 27db0ff68b2..ae74dc6cd38 100644 --- a/dev-vcs/subversion/subversion-1.10.4.ebuild +++ b/dev-vcs/subversion/subversion-1.10.4.ebuild @@ -130,6 +130,9 @@ pkg_setup() { append-cppflags -DSVN_DEBUG -DAP_DEBUG fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3c51c42014.3060...@wandisco.com%3E [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ @@ -152,6 +155,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild index a4a22eed915..7510d3694e6 100644 --- a/dev-vcs/subversion/subversion-1.11.1.ebuild +++ b/dev-vcs/subversion/subversion-1.11.1.ebuild @@ -126,6 +126,9 @@ pkg_setup() { echo -ne "\a" fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + if use debug ; then append-cppflags -DSVN_DEBUG -DAP_DEBUG fi @@ -152,6 +155,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild index 088d6446ba4..2f0f32c6f26 100644 --- a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild +++ b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild @@ -126,6 +126,9 @@ pkg_setup() { echo -ne "\a" fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + if use debug ; then append-cppflags -DSVN_DEBUG -DAP_DEBUG fi @@ -151,6 +154,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild index ebe11966889..6be305333dd 100644 --- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild +++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild @@ -89,6 +89,7 @@ PATCHES=( "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch "${FILESDIR}"/${P}-kf5.patch "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch + "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch ) want_apache @@ -131,6 +132,9 @@ pkg_setup() { echo -ne "\a" fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + if use debug ; then append-cppflags -DSVN_DEBUG -DAP_DEBUG fi
