From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6AE3158086 for ; Fri, 7 Jan 2022 05:15:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BF2F2BC008; Fri, 7 Jan 2022 05:15:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9878D2BC007 for ; Fri, 7 Jan 2022 05:15:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 417633430C7 for ; Fri, 7 Jan 2022 05:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87EA3291 for ; Fri, 7 Jan 2022 05:14:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641531979.dc58609e3079ec90ef2a2dbbfc96fbfae8f0237e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/toxic/Manifest net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch net-im/toxic/toxic-0.11.3.ebuild X-VCS-Directories: net-im/toxic/ net-im/toxic/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dc58609e3079ec90ef2a2dbbfc96fbfae8f0237e X-VCS-Branch: master Date: Fri, 7 Jan 2022 05:14:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b86ee33-e165-4077-a971-b2690cd4710e X-Archives-Hash: 56b9f592b994116c41e7f05fb6526b66 commit: dc58609e3079ec90ef2a2dbbfc96fbfae8f0237e Author: Josiah Mullins protonmail com> AuthorDate: Wed Dec 29 16:01:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 7 05:06:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc58609e net-im/toxic: Bump to version 0.11.3 Signed-off-by: Josiah Mullins protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23460 Signed-off-by: Sam James gentoo.org> net-im/toxic/Manifest | 1 + .../files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch | 39 +++++++ net-im/toxic/toxic-0.11.3.ebuild | 115 +++++++++++++++++++++ 3 files changed, 155 insertions(+) diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest index 4247de967283..cec989e95f38 100644 --- a/net-im/toxic/Manifest +++ b/net-im/toxic/Manifest @@ -1,2 +1,3 @@ DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787 +DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f diff --git a/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch new file mode 100644 index 000000000000..2101b64e3d9f --- /dev/null +++ b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch @@ -0,0 +1,39 @@ +diff -ruN src/autocomplete.c src/autocomplete.c +--- src/autocomplete.c ++++ src/autocomplete.c +@@ -29,6 +29,7 @@ + #include + #else + #include ++#include + #endif /* __APPLE__ */ + + #include "configdir.h" +diff -ruN src/file_transfers.h src/file_transfers.h +--- src/file_transfers.h ++++ src/file_transfers.h +@@ -25,6 +25,10 @@ + + #include + ++#ifdef __linux__ ++#include ++#endif ++ + #include "notify.h" + #include "toxic.h" + #include "windows.h" +diff -ruN src/settings.h src/settings.h +--- src/settings.h ++++ src/settings.h +@@ -25,6 +25,10 @@ + + #include + ++#ifdef __linux__ ++#include ++#endif ++ + #include + + /* Represents line_* hints max strlen */ diff --git a/net-im/toxic/toxic-0.11.3.ebuild b/net-im/toxic/toxic-0.11.3.ebuild new file mode 100644 index 000000000000..540224d42d30 --- /dev/null +++ b/net-im/toxic/toxic-0.11.3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-single-r1 xdg + +DESCRIPTION="A curses-based client for Tox" +HOMEPAGE="https://github.com/JFreegman/toxic" +SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + video? ( sound X ) " + +BDEPEND="dev-libs/libconfig:= + virtual/pkgconfig" + +RDEPEND="net-libs/tox:= + net-misc/curl + sys-kernel/linux-headers + sys-libs/ncurses:= + audio-notify? ( + media-libs/freealut + media-libs/openal + ) + notification? ( x11-libs/libnotify ) + debug? ( llvm? ( sys-devel/llvm:* ) ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( + media-gfx/qrencode:= + png? ( media-libs/libpng ) + ) + sound? ( + media-libs/openal + net-libs/tox:=[av] + ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + )" + +DEPEND="${RDEPEND}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + #prevent man files from being compressed. + sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages." + #Fix incorrect linkage of pthread (may be optional) + sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread." + #Makefile sets some required CFLAGS only if CFLAGS variable is undefined, + #This line changes the "lazy set if absent" assignment to a "lazy set" assignment. + #look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS + sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS" + #Fix incomplete invocation of python-config + sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking" + #This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros + eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements" +} + +src_configure() { + if ! use audio-notify; then + export DISABLE_SOUND_NOTIFY=1 + fi + if use debug; then + export ENABLE_RELEASE=0 + if use llvm; then + export ENABLE_ASAN=1 + fi + fi + if ! use games; then + export DISABLE_GAMES=1 + fi + if ! use notification; then + export DISABLE_DESKTOP_NOTIFY=1 + fi + if ! use png; then + export DISABLE_QRPNG=1 + fi + if use python; then + export ENABLE_PYTHON=1 + fi + if ! use qrcode; then + export DISABLE_QRCODE=1 + fi + if ! use sound; then + export DISABLE_AV=1 + fi + if ! use video; then + export DISABLE_VI=1 + fi + if ! use X; then + export DISABLE_X11=1 + fi + export USER_CFLAGS="${CFLAGS}" + export USER_LDFLAGS="${LDFLAGS}" + #set install directory to /usr. + sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!" +} + +src_install() { + default + if ! use audio-notify; then + rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory" + fi +}