[gentoo-commits] repo/gentoo:master commit in: net-im/toxic/files/, net-im/toxic/

[Joonas Niilola]

commit:     ad66309ae5c1a1a68cf7f3f89157a100bc00709e
Author:     Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Wed Aug 11 22:44:01 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 08:50:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad66309a

net-im/toxic: Bump to 0.11.1

Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21964
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/toxic/Manifest                              |   1 +
 .../files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch |  48 +++++++++
 net-im/toxic/metadata.xml                          |   1 +
 net-im/toxic/toxic-0.11.1.ebuild                   | 114 +++++++++++++++++++++
 4 files changed, 164 insertions(+)

diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index b1c440bd83e..5f20858fcd7 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.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e

diff --git a/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 00000000000..09845d294a2
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,48 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c	2021-08-09 18:52:27.090248882 -0400
++++ src/autocomplete.c	2021-08-11 14:57:39.029828530 -0400
+@@ -25,10 +25,12 @@
+ #include <string.h>
+ 
+ #ifdef __APPLE__
+-#include <sys/types.h>
+ #include <sys/dir.h>
++#include <sys/types.h>
++#include <sys/sysinfo.h>//This should contain PATH_MAX and NAME_MAX
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h	2021-07-26 15:39:36.765990567 -0400
++++ src/file_transfers.h	2021-08-11 14:59:41.223159195 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+ 
+ #include <limits.h>
++//This should include NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include "notify.h"
+ #include "toxic.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h	2021-08-09 18:52:27.093582216 -0400
++++ src/settings.h	2021-08-11 15:00:46.889824433 -0400
+@@ -24,6 +24,12 @@
+ #define SETTINGS_H
+ 
+ #include <limits.h>
++//This should include NAME_MAX and PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+ 
+ #include <tox/tox.h>

diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 799dd08bb74..a2f38a60d5b 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -21,6 +21,7 @@
 	</longdescription>
 	<use>
 		<flag name="audio-notify">Enables native sound notifications</flag>
+		<flag name="games">Enables some small mini-games</flag>
 		<flag name="llvm">Enables support for LLVM Address Sanitizer</flag>
 		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>

diff --git a/net-im/toxic/toxic-0.11.1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild
new file mode 100644
index 00000000000..f0ddb6556dd
--- /dev/null
+++ b/net-im/toxic/toxic-0.11.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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:="
+
+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
+}