summaryrefslogtreecommitdiff
path: root/net-im/toxic
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/toxic')
-rw-r--r--net-im/toxic/Manifest13
-rw-r--r--net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch49
-rw-r--r--net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch48
-rw-r--r--net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch49
-rw-r--r--net-im/toxic/metadata.xml1
-rw-r--r--net-im/toxic/toxic-0.10.1-r1.ebuild (renamed from net-im/toxic/toxic-0.10.1.ebuild)14
-rw-r--r--net-im/toxic/toxic-0.11.1.ebuild (renamed from net-im/toxic/toxic-0.10.0-r1.ebuild)42
-rw-r--r--net-im/toxic/toxic-0.8.3-r3.ebuild (renamed from net-im/toxic/toxic-0.8.3-r2.ebuild)11
8 files changed, 197 insertions, 30 deletions
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 744cf33e22b0..235b952cb1d0 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,7 +1,10 @@
-DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
+AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
+AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
+AUX toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch 1236 BLAKE2B ecbb048e6e34792c958a25fea05922ec5b82e24792566d8599b8fc355b7c8d5327735dc07b7fd707687647e19f79f1f5580643866eeaa3fb2cda17770086a383 SHA512 2c029f4e62a94a42649933658de7a85c220357a3c02035a2628202298341a729b7a26e81bbf3bc648ef1cd43d2eb52061185218af14bb63954771280a19daf42
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
-EBUILD toxic-0.10.0-r1.ebuild 2714 BLAKE2B 5473d9c4b78e94abe0827f9b8191cfd1f44b42ee5c07ef22c38be41474c812d542380a4af0f4b655e6590d4abaeff4fbdf67e3f802ccf48f98732b0a55c6c19f SHA512 bdf5e716b072843570bfbafa234b636871e71e20dbcf2a20a5b4e455e26ef104c78634a8bf854a3dd214cdd114768d6efb4111f061755ba3db266d0824d39ee7
-EBUILD toxic-0.10.1.ebuild 2697 BLAKE2B 1d9745a20a753ac3bf38cc9ae14ad85b24f99df947bb6a5bc7d057c23afd6b9d65897336c0574411bd41a51fbaf3b3b459256acf18bfca827c70b97f2594340a SHA512 5cce18abf16ec4d64034df723c56cc72a09cef70d2f09ac14d746379f4e78132cddb82898d9ba8955be5dae2d33c5838ea114e724ef567348a20b0bfea10564d
-EBUILD toxic-0.8.3-r2.ebuild 1817 BLAKE2B 73f8276337997cc2ea695cf691a47241ba981d414d6055b6f466503db0e79a14985cd1e08736570196c3196119f1db60edc668b5f271dfeca8dc2352b06682de SHA512 d94d058e687405ab6361babd1f3a8e7b8d98d456c4b7a8f06d55a7831cf88eedf041e778b605731d130baef1839b993280bfcf92ec7d54b46b703a56e8f69d29
-MISC metadata.xml 1154 BLAKE2B 5f94676351ad071b3278cc986d715ac5980fafa89a2be08253ac05787027b7a4cdbd3a9de8c88fece1ad35c8442956cbd089568d3c340f3ad6832186ed1d341b SHA512 2a65c022688774e5f892e7be3e69283e17164a47484f311544bc1bacbf3c5374c80736568adaa00db9b18f2ae1ff8946cc6a7c0912aaeb0a2c3b33f42ab7609b
+EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
+EBUILD toxic-0.11.1.ebuild 3027 BLAKE2B cfc32823322febc37941787bf1e489c2c235339373ac95821c82c7dfd2067b8fadcde3820dbf7e86b647174a59f8ab2e27db518eac9e04c64b53e03990a2f483 SHA512 0189331ae0a633867c9de2897d0be804d409ba661794c1f62f21929e071d87058919c2220194e8a862335419c305159f9452e9795b8c27c3f5da7debf406c552
+EBUILD toxic-0.8.3-r3.ebuild 2009 BLAKE2B 2d2888afcd59c4b087071182e3e7b612e608a0b733a064eb69f5e5317cd2146937e27bd1c757dff1ceecbbf9155c9b302135258f3beedf3f41babecfb4a66249 SHA512 63ae73ffea094e32a11f1a9d8bb1ab28f49e0eeafc7ce1c1b3cc6941fdbc109c447fc454d98148d2fa1320be77e4d5bccac8091b22390a3512d234215947c837
+MISC metadata.xml 1212 BLAKE2B bdee5f15d0a63e87e6868afa5e6c54903dec8007d0a33671c2bb2e4daef0cd0b86c5a4eda11492c8f7bc681b28728473fe258aced24106ec374d481576298f5d SHA512 60706359c2057d6b937a3e894fc1274a41b7e5968d6e7be21a2513f14fe425becc358437a7c4a20c96aa6fd67b6355d95655e869afb6a06ef9647c152a01d860
diff --git a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..68cb0bb59ccc
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c 2021-07-26 15:04:59.172715491 -0400
++++ src/autocomplete.c 2021-07-26 15:22:06.652686609 -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>
+ #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-07-26 15:39:41.899323757 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+
+ #include <limits.h>
++//This includes 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-07-26 15:04:59.176048823 -0400
++++ src/settings.h 2021-07-26 15:12:01.772703590 -0400
+@@ -24,6 +24,12 @@
+ #define SETTINGS_H
+
+ #include <limits.h>
++//This includes 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/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 000000000000..09845d294a2e
--- /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/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..11dc43c6b778
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c 2021-07-26 10:43:37.453154392 -0400
++++ src/autocomplete.c 2021-07-26 10:59:29.856460938 -0400
+@@ -27,8 +27,11 @@
+ #ifdef __APPLE__
+ #include <sys/types.h>
+ #include <sys/dir.h>
+-#else
++//This include NAME_MAX
++#include <sys/sysinfo.h>
++#elif __linux__
+ #include <dirent.h>
++#include <linux/limits.h>//This includes NAME_MAX
+ #endif /* __APPLE__ */
+
+ #include "windows.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h 2021-07-26 10:43:37.456487724 -0400
++++ src/file_transfers.h 2021-07-26 11:41:30.513057111 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+
+ #include <limits.h>
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h 2021-07-26 10:43:37.459821058 -0400
++++ src/settings.h 2021-07-26 11:45:46.709716594 -0400
+@@ -25,6 +25,13 @@
+
+ #include <limits.h>
+
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 799dd08bb740..a2f38a60d5b3 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.10.1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
index 4f0639961dc5..931dd62fc29a 100644
--- a/net-im/toxic/toxic-0.10.1.ebuild
+++ b/net-im/toxic/toxic-0.10.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 xdg
@@ -18,10 +18,12 @@ IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
video? ( sound X ) "
-RDEPEND="dev-libs/libconfig:=
- net-libs/tox:=
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox:=
net-misc/curl
sys-libs/ncurses:=
+ sys-kernel/linux-headers
audio-notify? (
media-libs/freealut
media-libs/openal
@@ -58,6 +60,10 @@ src_prepare() {
#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 force 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"
+ #Fix incorrect include statements for NAME_MAX and PATH_MAX macros
+ eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix header inclusion"
}
src_configure() {
@@ -101,6 +107,6 @@ src_configure() {
src_install() {
default
if ! use audio-notify; then
- rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+ rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
fi
}
diff --git a/net-im/toxic/toxic-0.10.0-r1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild
index de5dde5af0f2..d2d629d69b60 100644
--- a/net-im/toxic/toxic-0.10.0-r1.ebuild
+++ b/net-im/toxic/toxic-0.11.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-single-r1 xdg
@@ -14,14 +14,16 @@ 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 doc llvm notification png python qrcode +sound +video +X"
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
video? ( sound X ) "
-RDEPEND="
- dev-libs/libconfig:=
- net-libs/tox:=
+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
@@ -59,41 +61,47 @@ src_prepare() {
#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
- USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
+ export DISABLE_SOUND_NOTIFY=1
fi
if use debug; then
- USER_CFLAGS+="-DENABLE_RELEASE=0 "
+ export ENABLE_RELEASE=0
if use llvm; then
- USER_CFLAGS+="-DENABLE_ASAN=1 "
+ export ENABLE_ASAN=1
fi
fi
+ if ! use games; then
+ export DISABLE_GAMES=1
+ fi
if ! use notification; then
- USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
+ export DISABLE_DESKTOP_NOTIFY=1
fi
if ! use png; then
- USER_CFLAGS+="-DDISABLE_QRPNG=1 "
+ export DISABLE_QRPNG=1
fi
if use python; then
- USER_CFLAGS+="-DENABLE_PYTHON=1"
+ export ENABLE_PYTHON=1
fi
if ! use qrcode; then
- USER_CFLAGS+="-DDISABLE_QRCODE=1"
+ export DISABLE_QRCODE=1
fi
if ! use sound; then
- USER_CFLAGS+="-DDISABLE_AV=1 "
+ export DISABLE_AV=1
fi
if ! use video; then
- USER_CFLAGS+="-DDISABLE_VI=1"
+ export DISABLE_VI=1
fi
if ! use X; then
- USER_CFLAGS+="-DDISABLE_X11=1 "
+ export DISABLE_X11=1
fi
- USER_CFLAGS+="${CFLAGS}"
- export USER_CFLAGS
+ 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!"
diff --git a/net-im/toxic/toxic-0.8.3-r2.ebuild b/net-im/toxic/toxic-0.8.3-r3.ebuild
index fb4792fc89e0..97ed2aa0ae38 100644
--- a/net-im/toxic/toxic-0.8.3-r2.ebuild
+++ b/net-im/toxic/toxic-0.8.3-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 xdg
@@ -17,11 +17,12 @@ KEYWORDS="amd64 x86"
IUSE="notification python qrcode +sound +video +X"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="
- dev-libs/libconfig:=
- >=net-libs/tox-0.2.8:=
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox:=
net-misc/curl
sys-libs/ncurses:=
+ sys-kernel/linux-headers
notification? ( x11-libs/libnotify )
python? ( ${PYTHON_DEPS} )
qrcode? ( media-gfx/qrencode:= )
@@ -45,6 +46,8 @@ 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 include declarations for NAME_MAX and PATH_MAX.
+ eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
}
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 22:21:41 +0000