diff --git a/common/shlibs b/common/shlibs index 7baca608c4d..eb135f4e8dc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -705,6 +705,7 @@ libsvn_fs_fs-1.so.0 libsvn-1.7.5_1 libsvn_fs_base-1.so.0 libsvn-1.7.5_1 libsvn_ra_local-1.so.0 libsvn-1.7.5_1 libsvn_ra_neon-1.so.0 libsvn-1.7.5_1 +libsvn_ra_serf-1.so.0 libsvn-1.8.1_1 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1 libsvn_swig_ruby-1.so.0 subversion-ruby-1.7.5_1 @@ -1397,4 +1398,4 @@ libphorward.so.0 libphorward-0.17_1 libusbip.so.0 libusbip-3.10_1 libcpupower.so.0 libcpupower-3.10_1 librsync.so.1 librsync-0.9.7_1 -libserf.so.3 serf-1.3.1_1 +libserf-1.so.3 serf-1.3.1_1 diff --git a/srcpkgs/subversion-kwallet-auth b/srcpkgs/subversion-kwallet-auth new file mode 120000 index 00000000000..4f007e127ca --- /dev/null +++ b/srcpkgs/subversion-kwallet-auth @@ -0,0 +1 @@ +subversion \ No newline at end of file diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 672f2174e6a..36f45c7d7d9 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,31 +1,29 @@ # Template file for 'subversion' pkgname=subversion -version=1.7.10 +version=1.8.1 revision=1 short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " license="Apache-2.0, BSD" homepage="http://subversion.apache.org/" distfiles="http://apache.rediris.es/subversion/subversion-${version}.tar.bz2" -checksum=c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7 +checksum=faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4 -# XXX enable kwallet when kdelibs is available. hostmakedepends="pkg-config" makedepends="db-devel>=5.3 perl>=5.16 python-devel swig apr-util-devel - libldap-devel gdbm-devel expat-devel apr-devel libuuid-devel + libldap-devel serf-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel - neon-devel apache-devel ca-certificates" + qt-devel kdelibs-devel apache-devel ca-certificates" do_configure() { ./configure ${configure_args} \ --with-apxs --disable-javahl --disable-static \ - --without-kwallet --with-gnome-keyring --with-editor=vim \ + --with-kwallet --with-gnome-keyring --with-editor=vi \ --disable-mod-activation } do_build() { - make ${makejobs} external-all - make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" make ${makejobs} swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ swig-py swig-pl @@ -91,6 +89,13 @@ subversion-gnome-keyring-auth_package() { } } +subversion-kwallet-auth_package() { + short_desc+=" - KDE kwallet authentication support" + pkg_install() { + vmove "usr/lib/libsvn_auth_k*" + } +} + subversion-python_package() { depends="python" pycompile_module="libsvn svn"