From c9e06585771fd2562fdb010f6539f85fb1bef10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= Date: Tue, 24 Mar 2015 23:55:46 +0100 Subject: [PATCH 1/4] New package: toxic-0.5.2_1 --- srcpkgs/toxcore-git/template | 4 +++- srcpkgs/toxic/template | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/toxic/template diff --git a/srcpkgs/toxcore-git/template b/srcpkgs/toxcore-git/template index dc26ce6d337..9f77ad5e407 100644 --- a/srcpkgs/toxcore-git/template +++ b/srcpkgs/toxcore-git/template @@ -1,7 +1,8 @@ # Template file for 'toxcore-git' pkgname="toxcore-git" version="20150313" -revision=1 +revision=2 +_commithash="4ad76497881ee2a623acdedcf0ac10406208b716" short_desc="Encrypted peer-to-peer instant messenger protocol library" maintainer="Stefan Mühlinghaus " license="GPL-3" @@ -15,6 +16,7 @@ do_fetch() { } pre_configure() { + git checkout ${_commithash} ./autogen.sh } diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template new file mode 100644 index 00000000000..9394a00a855 --- /dev/null +++ b/srcpkgs/toxic/template @@ -0,0 +1,22 @@ +# Template file for 'toxic' +pkgname="toxic" +version="0.5.2" +revision=1 +_commithash="0c39e7b158ff74a2ef4ed62a72b5b7a3c878ac7f" +short_desc="NCurses-based TOX instant messanger client" +maintainer="Stefan Mühlinghaus " +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" +build_style="gnu-makefile" +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} +} + 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 2/4] 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}" From 2a34bce5b1d888a0e912bddf79daa784f94f69cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= Date: Fri, 27 Mar 2015 09:31:08 +0100 Subject: [PATCH 3/4] toxic: Removed explicit ncurses-libs dependency as suggested by xtraeme --- srcpkgs/toxic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index 246c4c24a9e..c6d2242f398 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -8,7 +8,7 @@ maintainer="Stefan Mühlinghaus " 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" +makedepends="toxcore-devel-git>=20150313_2 libX11-devel freealut-devel libconfig-devel ncurses-devel>=5.9_10 libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel" hostmakedepends="pkg-config" build_style="gnu-makefile" distfiles="https://github.com/Tox/toxic/archive/${_commithash}.tar.gz" From e35f331d5d244cec88ad1845e55a30e7950523b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= Date: Sat, 28 Mar 2015 10:53:27 +0100 Subject: [PATCH 4/4] toxic: Removed makedepends version comparasion as pointed out by xtraeme --- srcpkgs/toxic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index c6d2242f398..805e0182136 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -8,7 +8,7 @@ maintainer="Stefan Mühlinghaus " 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-devel>=5.9_10 libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel" +makedepends="toxcore-devel-git libX11-devel freealut-devel libconfig-devel ncurses-devel libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel" hostmakedepends="pkg-config" build_style="gnu-makefile" distfiles="https://github.com/Tox/toxic/archive/${_commithash}.tar.gz"