summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-04-18 01:09:47 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-04-18 01:09:47 +0000
commit03712bd9cd5ebf6d9351f10b92ca48092627744a (patch)
treed21ac99ea6c1c76a97d3e3d1ca54676bc92aedeb /user
parent0e694a50588c5f6b0df5cf5245e07c089282a286 (diff)
downloadpackages-03712bd9cd5ebf6d9351f10b92ca48092627744a.tar.gz
packages-03712bd9cd5ebf6d9351f10b92ca48092627744a.tar.bz2
packages-03712bd9cd5ebf6d9351f10b92ca48092627744a.tar.xz
packages-03712bd9cd5ebf6d9351f10b92ca48092627744a.zip
user/subversion: bump to 1.11.1, what a bloody mess
Diffstat (limited to 'user')
-rw-r--r--user/subversion/APKBUILD23
-rw-r--r--user/subversion/apr-1.7.0.patch18
2 files changed, 35 insertions, 6 deletions
diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD
index 3d9a96a68..1d034aff3 100644
--- a/user/subversion/APKBUILD
+++ b/user/subversion/APKBUILD
@@ -1,25 +1,37 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=subversion
-pkgver=1.10.4
+pkgver=1.11.1
pkgrel=0
pkgdesc="Version control system from 2000"
url="https://subversion.apache.org/"
arch="all"
+options="!check" # Test suite no longer works with Python 3:
+ # https://issues.apache.org/jira/browse/SVN-4811
license="Apache-2.0"
depends=""
depends_dev="apr-dev apr-util-dev linux-headers"
makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev
kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev
- serf-dev sqlite-dev utf8proc-dev zlib-dev"
+ serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet
$pkgname-lang"
source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
+ apr-1.7.0.patch
python3-bang.patch
"
build() {
- cd "$builddir"
+ # this is only needed for autogen.sh
+ _PATH=$PATH
+ ln -s /usr/bin/python3 "$srcdir"/python
+ export PATH=$srcdir:$PATH
+ ./autogen.sh
+ rm "$srcdir"/python
+ export PATH=$_PATH
+ # this is needed to fix the apr issue as well as the patch
+ # https://issues.apache.org/jira/browse/SVN-4813
+ export CPPFLAGS="$CPPFLAGS -P"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +44,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" -j1 install
}
@@ -54,5 +64,6 @@ kwallet() {
mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/
}
-sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2
+sha512sums="2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d subversion-1.11.1.tar.bz2
+71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch
1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch"
diff --git a/user/subversion/apr-1.7.0.patch b/user/subversion/apr-1.7.0.patch
new file mode 100644
index 000000000..a74e5e454
--- /dev/null
+++ b/user/subversion/apr-1.7.0.patch
@@ -0,0 +1,18 @@
+--- subversion-1.11.1/build/ac-macros/swig.m4
++++ subversion-1.11.1/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"])