From c12db84339db1b65b838f0939622f7b68c759345 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 29 Jan 2015 18:53:38 +0100 Subject: [PATCH] Revert "nettle: update to 3.0 (soname bump) and rebuild revdeps against it." This reverts commit 899910c9b4cd584c0942dfb650a3b154db1ab36a. --- common/shlibs | 4 ++-- srcpkgs/gnutls/template | 4 ++-- srcpkgs/kodi/template | 5 ++--- srcpkgs/nettle/template | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8da8eff39e..a1ab6e5844 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1110,8 +1110,8 @@ libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1 libgee-0.8.so.2 libgee08-0.8.2_1 -libnettle.so.5 nettle-3.0_1 -libhogweed.so.3 nettle-3.0_1 +libnettle.so.4 nettle-2.5_1 +libhogweed.so.2 nettle-2.5_1 libmikmod.so.3 libmikmod-3.2.0_1 libgtkspell.so.0 gtkspell-2.0.16_1 libpurple.so.0 libpurple-2.10.6_1 diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 068293806d..3246f838e5 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,7 +1,7 @@ # Template build file for 'gnutls'. pkgname=gnutls version=3.3.12 -revision=2 +revision=1 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static --disable-valgrind-tests --disable-rpath" @@ -14,7 +14,7 @@ checksum=67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b hostmakedepends="automake gettext-devel pkg-config libtool" makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel - libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel>=3.0 libidn-devel" + libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel libidn-devel" pre_configure() { autoreconf -fi diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 3e2ec61d15..ec27d53867 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=14.0 -revision=4 +revision=3 wrksrc="xbmc-${version}-Helix" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " @@ -31,8 +31,7 @@ makedepends=" enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel libbluetooth-devel yajl-devel libplist-devel>=1.12 librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel - libcec-devel libxslt-devel nettle-devel>=3.0 gnutls-devel libssh-devel - libmicrohttpd-devel" + libcec-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist>=1.12" diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index d6d875e8a7..58597a68a2 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -1,9 +1,8 @@ # Template build file for 'nettle'. pkgname=nettle -version=3.0 -revision=1 +version=2.7.1 +revision=3 build_style=gnu-configure -hostmakedepends="m4" makedepends="gmp-devel" configure_args="--enable-shared" short_desc="A low-level cryptographic library" @@ -11,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.lysator.liu.se/~nisse/nettle/" license="GPL-2" distfiles="http://ftp.gnu.org/gnu/nettle/nettle-${version}.tar.gz" -checksum=9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913 +checksum=bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 nettle-devel_package() { depends="gmp-devel ${sourcepkg}>=${version}_${revision}" @@ -24,6 +23,7 @@ nettle-devel_package() { vmove usr/share/info } } + nettle-tools_package() { short_desc+=" - bundled tools" pkg_install() {