From 0cf2d087ca3d3aeec823c85de7b0cd2b031b5e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= Date: Thu, 26 Mar 2015 13:24:09 +0100 Subject: [PATCH] toxic, toxcore: Changed download method and updated common/shlibs --- common/shlibs | 8 ++++---- srcpkgs/toxcore-git/template | 10 ++++------ srcpkgs/toxic/template | 11 ++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/common/shlibs b/common/shlibs index d53594f6d28..2f72a1fb932 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1961,7 +1961,7 @@ libprotobuf-c.so.1 protobuf-c-1.1.0_1 libutf8proc.so.1 libutf8proc-1.1.6_1 libnsutils.so.0 libnsutils-0.0.1_1 libfilteraudio.so.0 filteraudio-git-20150313_1 -libtoxcore.so.0 toxcore-git-20150313_1 -libtoxencryptsave.so.0 toxcore-git-20150313_1 -libtoxdns.so.0 toxcore-git-20150313_1 -libtoxav.so.0 toxcore-git-20150313_1 +libtoxcore.so.0 toxcore-git-20150313_2 +libtoxencryptsave.so.0 toxcore-git-20150313_2 +libtoxdns.so.0 toxcore-git-20150313_2 +libtoxav.so.0 toxcore-git-20150313_2 diff --git a/srcpkgs/toxcore-git/template b/srcpkgs/toxcore-git/template index 9f77ad5e407..7b7f0238b04 100644 --- a/srcpkgs/toxcore-git/template +++ b/srcpkgs/toxcore-git/template @@ -8,15 +8,13 @@ maintainer="Stefan Mühlinghaus " license="GPL-3" homepage="https://tox.im" makedepends="libsodium-devel opus-devel libvpx-devel" -hostmakedepends="git autoconf automake libtool pkg-config" +hostmakedepends="autoconf automake libtool pkg-config" +distfiles="https://github.com/irungentoo/toxcore/archive/${_commithash}.tar.gz" +checksum="97087e7080267f2e27ffca125a507cd76173718242e31b8ca776cf313ad9d421" +wrksrc="toxcore-${_commithash}" build_style="gnu-configure" -do_fetch() { - git clone https://github.com/irungentoo/toxcore.git ${wrksrc} -} - pre_configure() { - git checkout ${_commithash} ./autogen.sh } diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index 9394a00a855..246c4c24a9e 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -9,14 +9,11 @@ license="GPL-3" homepage="https://wiki.tox.im/Toxic" depends="toxcore-git>=20150313_2" makedepends="toxcore-devel-git>=20150313_2 libX11-devel freealut-devel libconfig-devel ncurses-libs ncurses-devel>=5.9_10 libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel" -hostmakedepends="git pkg-config" +hostmakedepends="pkg-config" build_style="gnu-makefile" +distfiles="https://github.com/Tox/toxic/archive/${_commithash}.tar.gz" +checksum="14990c674363004b7d2d4c14706f8a6232eb0b546e7b8f9889867761de548435" make_install_args="-C build ${make_install_args}" make_build_args="${make_install_args}" - -do_fetch() { - git clone https://github.com/Tox/toxic.git ${wrksrc} - cd "${wrksrc}" - git checkout ${_commithash} -} +wrksrc="toxic-${_commithash}"