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@gentoo.org>

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 (file)
index 0000000..a0da4a5
--- /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 27db0ff68b2e9088425c6fc666585c4bc04a46a0..ae74dc6cd3875dfa2a89b7cb497bcb9b378fc538 100644 (file)
--- 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.3060700@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 a4a22eed9157338b7744146703a77b5da1f9f44a..7510d3694e68ce6db043252eb4a273f03a7c15e7 100644 (file)
--- 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 088d6446ba45301d81cd9aac083e236d9cef9e87..2f0f32c6f26e543bec79ab60d57370d6aea08475 100644 (file)
--- 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 ebe11966889b0ef4c58c9b4f54a562c087e44dfb..6be305333dd62b0e269a3e74ec892287eb6cb36b 100644 (file)
--- 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