From e8081b66dc45a5701a84c4cc18208a37ebfca35c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 31 Dec 2016 12:59:19 +0100 Subject: [PATCH 1/5] New package: toxcore-0.1.2 --- common/shlibs | 8 ++--- srcpkgs/toxcore-devel | 1 + srcpkgs/toxcore/files/toxbootstrapd/run | 3 ++ srcpkgs/toxcore/template | 39 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/toxcore-devel create mode 100644 srcpkgs/toxcore/files/toxbootstrapd/run create mode 100644 srcpkgs/toxcore/template diff --git a/common/shlibs b/common/shlibs index 9206842b76d..b76f1342fa9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2041,10 +2041,10 @@ 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-20150416_3 -libtoxcore.so.0 toxcore-git-20150604_1 -libtoxencryptsave.so.0 toxcore-git-20150604_1 -libtoxdns.so.0 toxcore-git-20150604_1 -libtoxav.so.0 toxcore-git-20150604_1 +libtoxcore.so.0 toxcore-0.1.2_1 +libtoxdns.so.0 toxcore-0.1.2_1 +libtoxencryptsave.so.0 toxcore-0.1.2_1 +libtoxav.so.0 toxcore-0.1.2_1 libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.7.2_1 libxmp.so.4 libxmp-4.3.7_1 diff --git a/srcpkgs/toxcore-devel b/srcpkgs/toxcore-devel new file mode 120000 index 00000000000..4c88cfc4743 --- /dev/null +++ b/srcpkgs/toxcore-devel @@ -0,0 +1 @@ +toxcore \ No newline at end of file diff --git a/srcpkgs/toxcore/files/toxbootstrapd/run b/srcpkgs/toxcore/files/toxbootstrapd/run new file mode 100644 index 00000000000..912467f3fe0 --- /dev/null +++ b/srcpkgs/toxcore/files/toxbootstrapd/run @@ -0,0 +1,3 @@ +#!/bin/sh +cd /etc/toxbootstrapd +exec chpst -u toxbootstrapd DHT_bootstrap diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template new file mode 100644 index 00000000000..e956db10edf --- /dev/null +++ b/srcpkgs/toxcore/template @@ -0,0 +1,39 @@ +# Template file for 'toxcore' +pkgname=toxcore +version=0.1.2 +revision=1 +build_style=gnu-configure +wrksrc="c-toxcore-${version}" +hostmakedepends="autoconf automake libtool pkg-config" +makedepends="libsodium-devel opus-devel libvpx-devel" +short_desc="Encrypted peer-to-peer instant messenger protocol library" +maintainer="Spencer Hill " +license="GPL-3" +homepage="https://tox.chat" +distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz" +checksum=605a462f77b497009217b8dbd01108d112e9a8b018473826379f9f4ffa5c0b66 + +configure_args="--enable-daemon" +system_accounts="toxbootstrapd" +toxbootstrapd_homedir="/etc/toxbootstrapd" +make_dirs="/etc/toxbootstrapd 0700 toxbootstrapd toxbootstrapd" +replaces="toxcore-git>=0" + +pre_configure() { + ./autogen.sh +} + +post_install() { + vsv toxbootstrapd +} + +# Development package +toxcore-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/pkgconfig + } +} From c2dd0c4d4e96a1b5a0d3dad4507189e2822628ce Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 31 Dec 2016 13:00:25 +0100 Subject: [PATCH 2/5] qtox: update to 1.7.1. --- srcpkgs/qtox/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index b33711b5ea7..20ef33a68f0 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,20 +1,20 @@ # Template file for 'qtox' pkgname=qtox -version=1.5.1 -revision=3 +version=1.7.1 +revision=1 build_style=qmake short_desc="QT-based TOX instant messenger client" maintainer="Spencer Hill " license="GPL-3" homepage="https://wiki.tox.chat/clients/qtox" hostmakedepends="qt5-qmake pkg-config" -makedepends="toxcore-devel-git filteraudio-devel-git ffmpeg-devel qt5-svg-devel +makedepends="toxcore-devel filteraudio-devel-git ffmpeg-devel qt5-svg-devel qt5-tools-devel libopencv-devel libopenal-devel libsodium-devel libXScrnSaver-devel gdk-pixbuf-devel gtk+-devel libvpx-devel qrencode-devel sqlcipher-devel" depends="qt5-plugin-sqlite" distfiles="https://github.com/tux3/qTox/archive/v${version}.tar.gz" -checksum=5b2ee896dfe33db29f7a2775faadb9e1063a4520893333fe0c93949e06ab2578 +checksum=0d2a94be6f470e64f2722d261b9294b6ecc3418e374c47f722ca1a24058486e8 wrksrc="qTox-${version}" pre_configure() { From 216500dfa6cc4f05e662698984323363d7e49fd5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 31 Dec 2016 13:00:25 +0100 Subject: [PATCH 3/5] utox: update to 0.11.1. --- srcpkgs/utox/patches/fix-install.patch | 20 ++++++++++++++++++++ srcpkgs/utox/template | 16 ++++++---------- srcpkgs/utox/update | 1 - 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/utox/patches/fix-install.patch delete mode 100644 srcpkgs/utox/update diff --git a/srcpkgs/utox/patches/fix-install.patch b/srcpkgs/utox/patches/fix-install.patch new file mode 100644 index 00000000000..2af119e93f0 --- /dev/null +++ b/srcpkgs/utox/patches/fix-install.patch @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2016-12-21 09:12:44.000000000 +0000 ++++ CMakeLists.txt 2016-12-31 12:14:05.294261593 +0000 +@@ -147,7 +147,7 @@ + target_link_libraries(utoxNATIVE icon v4lconvert X11 Xext Xrender fontconfig freetype resolv dl ) + + install(FILES +- utox ++ build/utox + DESTINATION "bin" + ) + install(FILES +@@ -156,7 +156,7 @@ + ) + install(FILES + src/utox.1 +- DESTINATION "man/man1" ++ DESTINATION "share/man/man1" + ) + + endif() diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template index 25d8102ac00..fa3aa4bdaf7 100644 --- a/srcpkgs/utox/template +++ b/srcpkgs/utox/template @@ -1,22 +1,18 @@ # Template file for 'utox' pkgname=utox -version=0.9.8 -revision=2 +version=0.11.1 +revision=1 wrksrc="uTox-${version}" -build_style=gnu-makefile +build_style=cmake short_desc="Lightweight TOX instant messenger client written in C" maintainer="Spencer Hill " license="GPL-3" homepage="http://utox.org/" -makedepends="toxcore-devel-git filteraudio-devel-git fontconfig-devel +makedepends="toxcore-devel filteraudio-devel-git fontconfig-devel freetype-devel libopenal-devel libvpx-devel libX11-devel libXext-devel libXrender-devel dbus-devel v4l-utils-devel libsodium-devel opus-devel" hostmakedepends="pkg-config" -distfiles="https://github.com/GrayHatter/uTox/archive/v${version}.tar.gz" -checksum=5e33ec8500a70ea2bd468881b2eec5d7f6adb112a64a9fdc5e6e3ff6f9c20e8e +distfiles="https://github.com/uTox/uTox/archive/v${version}.tar.gz" +checksum=b5684688a2e8ac1863f1e83c566d3ddc69611f03cc24736ac53ef301c5ea65a9 nocross="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/12668/steps/shell_3/logs/stdio" - -do_build() { - make CC=$CC PREFIX=/usr GIT_V=${version} ${makejobs} -} diff --git a/srcpkgs/utox/update b/srcpkgs/utox/update deleted file mode 100644 index 26e890c260c..00000000000 --- a/srcpkgs/utox/update +++ /dev/null @@ -1 +0,0 @@ -pattern='archive/v\K[\da-z.]+(?=\.tar\.gz)' From f2c8dd2d11348ac7b016119aa7d428038c86f4c5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 31 Dec 2016 13:00:26 +0100 Subject: [PATCH 4/5] toxic: update to 0.7.2. --- srcpkgs/toxic/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index 002e01fd67b..2a0dfc5a99d 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -1,17 +1,17 @@ # Template file for 'toxic' pkgname=toxic -version=0.7.1 +version=0.7.2 revision=1 short_desc="Ncurses-based TOX instant messanger client" maintainer="Juan RP " license="GPL-3" -homepage="https://wiki.tox.im/Toxic" +homepage="https://github.com/JFreegman/toxic/" distfiles="https://github.com/JFreegman/toxic/archive/v${version}.tar.gz" -checksum=414ca2cd369e277872c7248c43f82afa0ac2f6c8fa5fc8e93f7c3e8ab6d11b9c +checksum=a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59 build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="toxcore-devel-git libX11-devel freealut-devel libconfig-devel +makedepends="toxcore-devel libX11-devel freealut-devel libconfig-devel ncurses-devel libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel qrencode-devel libcurl-devel" From 8b8d3f4302bef088901e23124891bd298af0b5ec Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 31 Dec 2016 13:01:06 +0100 Subject: [PATCH 5/5] toxcore-git: remove --- srcpkgs/toxcore-devel-git | 1 - srcpkgs/toxcore-git/files/toxbootstrapd/run | 3 -- srcpkgs/toxcore-git/template | 39 --------------------- 3 files changed, 43 deletions(-) delete mode 120000 srcpkgs/toxcore-devel-git delete mode 100644 srcpkgs/toxcore-git/files/toxbootstrapd/run delete mode 100644 srcpkgs/toxcore-git/template diff --git a/srcpkgs/toxcore-devel-git b/srcpkgs/toxcore-devel-git deleted file mode 120000 index d7e4cbd7eb9..00000000000 --- a/srcpkgs/toxcore-devel-git +++ /dev/null @@ -1 +0,0 @@ -toxcore-git \ No newline at end of file diff --git a/srcpkgs/toxcore-git/files/toxbootstrapd/run b/srcpkgs/toxcore-git/files/toxbootstrapd/run deleted file mode 100644 index 912467f3fe0..00000000000 --- a/srcpkgs/toxcore-git/files/toxbootstrapd/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /etc/toxbootstrapd -exec chpst -u toxbootstrapd DHT_bootstrap diff --git a/srcpkgs/toxcore-git/template b/srcpkgs/toxcore-git/template deleted file mode 100644 index 52cb1a7f697..00000000000 --- a/srcpkgs/toxcore-git/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'toxcore-git' -pkgname=toxcore-git -version=20160707 -revision=2 -build_style=gnu-configure -_commithash=755f084e8720b349026c85afbad58954cb7ff1d4 -hostmakedepends="autoconf automake libtool pkg-config" -makedepends="libsodium-devel opus-devel libvpx-devel" -short_desc="Encrypted peer-to-peer instant messenger protocol library" -maintainer="Spencer Hill " -license="GPL-3" -homepage="https://tox.chat" -distfiles="https://github.com/irungentoo/toxcore/archive/${_commithash}.tar.gz" -checksum=2d4a0d096bdb81b12b10551765fb9f87270e170f10f387f700b3def68cb6c35c - -wrksrc="toxcore-${_commithash}" -configure_args="--enable-daemon" -system_accounts="toxbootstrapd" -toxbootstrapd_homedir="/etc/toxbootstrapd" -make_dirs="/etc/toxbootstrapd 0700 toxbootstrapd toxbootstrapd" - -pre_configure() { - ./autogen.sh -} - -post_install() { - vsv toxbootstrapd -} - -# Development package -toxcore-devel-git_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/pkgconfig - } -}