1 |
commit: dc58609e3079ec90ef2a2dbbfc96fbfae8f0237e |
2 |
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com> |
3 |
AuthorDate: Wed Dec 29 16:01:51 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 7 05:06:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc58609e |
7 |
|
8 |
net-im/toxic: Bump to version 0.11.3 |
9 |
|
10 |
Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/23460 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-im/toxic/Manifest | 1 + |
15 |
.../files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch | 39 +++++++ |
16 |
net-im/toxic/toxic-0.11.3.ebuild | 115 +++++++++++++++++++++ |
17 |
3 files changed, 155 insertions(+) |
18 |
|
19 |
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest |
20 |
index 4247de967283..cec989e95f38 100644 |
21 |
--- a/net-im/toxic/Manifest |
22 |
+++ b/net-im/toxic/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d |
25 |
DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787 |
26 |
+DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 000000000000..2101b64e3d9f |
31 |
--- /dev/null |
32 |
+++ b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch |
33 |
@@ -0,0 +1,39 @@ |
34 |
+diff -ruN src/autocomplete.c src/autocomplete.c |
35 |
+--- src/autocomplete.c |
36 |
++++ src/autocomplete.c |
37 |
+@@ -29,6 +29,7 @@ |
38 |
+ #include <sys/dir.h> |
39 |
+ #else |
40 |
+ #include <dirent.h> |
41 |
++#include <linux/limits.h> |
42 |
+ #endif /* __APPLE__ */ |
43 |
+ |
44 |
+ #include "configdir.h" |
45 |
+diff -ruN src/file_transfers.h src/file_transfers.h |
46 |
+--- src/file_transfers.h |
47 |
++++ src/file_transfers.h |
48 |
+@@ -25,6 +25,10 @@ |
49 |
+ |
50 |
+ #include <limits.h> |
51 |
+ |
52 |
++#ifdef __linux__ |
53 |
++#include <linux/limits.h> |
54 |
++#endif |
55 |
++ |
56 |
+ #include "notify.h" |
57 |
+ #include "toxic.h" |
58 |
+ #include "windows.h" |
59 |
+diff -ruN src/settings.h src/settings.h |
60 |
+--- src/settings.h |
61 |
++++ src/settings.h |
62 |
+@@ -25,6 +25,10 @@ |
63 |
+ |
64 |
+ #include <limits.h> |
65 |
+ |
66 |
++#ifdef __linux__ |
67 |
++#include <linux/limits.h> |
68 |
++#endif |
69 |
++ |
70 |
+ #include <tox/tox.h> |
71 |
+ |
72 |
+ /* Represents line_* hints max strlen */ |
73 |
|
74 |
diff --git a/net-im/toxic/toxic-0.11.3.ebuild b/net-im/toxic/toxic-0.11.3.ebuild |
75 |
new file mode 100644 |
76 |
index 000000000000..540224d42d30 |
77 |
--- /dev/null |
78 |
+++ b/net-im/toxic/toxic-0.11.3.ebuild |
79 |
@@ -0,0 +1,115 @@ |
80 |
+# Copyright 1999-2021 Gentoo Authors |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI=8 |
84 |
+ |
85 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
86 |
+ |
87 |
+inherit python-single-r1 xdg |
88 |
+ |
89 |
+DESCRIPTION="A curses-based client for Tox" |
90 |
+HOMEPAGE="https://github.com/JFreegman/toxic" |
91 |
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
92 |
+ |
93 |
+LICENSE="GPL-3+" |
94 |
+SLOT="0" |
95 |
+KEYWORDS="~amd64 ~x86" |
96 |
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X" |
97 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
98 |
+ video? ( sound X ) " |
99 |
+ |
100 |
+BDEPEND="dev-libs/libconfig:= |
101 |
+ virtual/pkgconfig" |
102 |
+ |
103 |
+RDEPEND="net-libs/tox:= |
104 |
+ net-misc/curl |
105 |
+ sys-kernel/linux-headers |
106 |
+ sys-libs/ncurses:= |
107 |
+ audio-notify? ( |
108 |
+ media-libs/freealut |
109 |
+ media-libs/openal |
110 |
+ ) |
111 |
+ notification? ( x11-libs/libnotify ) |
112 |
+ debug? ( llvm? ( sys-devel/llvm:* ) ) |
113 |
+ python? ( ${PYTHON_DEPS} ) |
114 |
+ qrcode? ( |
115 |
+ media-gfx/qrencode:= |
116 |
+ png? ( media-libs/libpng ) |
117 |
+ ) |
118 |
+ sound? ( |
119 |
+ media-libs/openal |
120 |
+ net-libs/tox:=[av] |
121 |
+ ) |
122 |
+ X? ( |
123 |
+ x11-base/xorg-proto |
124 |
+ x11-libs/libX11 |
125 |
+ )" |
126 |
+ |
127 |
+DEPEND="${RDEPEND}" |
128 |
+ |
129 |
+pkg_setup() { |
130 |
+ use python && python-single-r1_pkg_setup |
131 |
+} |
132 |
+ |
133 |
+src_prepare() { |
134 |
+ default |
135 |
+ #prevent man files from being compressed. |
136 |
+ sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages." |
137 |
+ #Fix incorrect linkage of pthread (may be optional) |
138 |
+ sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread." |
139 |
+ #Makefile sets some required CFLAGS only if CFLAGS variable is undefined, |
140 |
+ #This line changes the "lazy set if absent" assignment to a "lazy set" assignment. |
141 |
+ #look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS |
142 |
+ sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS" |
143 |
+ #Fix incomplete invocation of python-config |
144 |
+ sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking" |
145 |
+ #This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros |
146 |
+ eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements" |
147 |
+} |
148 |
+ |
149 |
+src_configure() { |
150 |
+ if ! use audio-notify; then |
151 |
+ export DISABLE_SOUND_NOTIFY=1 |
152 |
+ fi |
153 |
+ if use debug; then |
154 |
+ export ENABLE_RELEASE=0 |
155 |
+ if use llvm; then |
156 |
+ export ENABLE_ASAN=1 |
157 |
+ fi |
158 |
+ fi |
159 |
+ if ! use games; then |
160 |
+ export DISABLE_GAMES=1 |
161 |
+ fi |
162 |
+ if ! use notification; then |
163 |
+ export DISABLE_DESKTOP_NOTIFY=1 |
164 |
+ fi |
165 |
+ if ! use png; then |
166 |
+ export DISABLE_QRPNG=1 |
167 |
+ fi |
168 |
+ if use python; then |
169 |
+ export ENABLE_PYTHON=1 |
170 |
+ fi |
171 |
+ if ! use qrcode; then |
172 |
+ export DISABLE_QRCODE=1 |
173 |
+ fi |
174 |
+ if ! use sound; then |
175 |
+ export DISABLE_AV=1 |
176 |
+ fi |
177 |
+ if ! use video; then |
178 |
+ export DISABLE_VI=1 |
179 |
+ fi |
180 |
+ if ! use X; then |
181 |
+ export DISABLE_X11=1 |
182 |
+ fi |
183 |
+ export USER_CFLAGS="${CFLAGS}" |
184 |
+ export USER_LDFLAGS="${LDFLAGS}" |
185 |
+ #set install directory to /usr. |
186 |
+ sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!" |
187 |
+} |
188 |
+ |
189 |
+src_install() { |
190 |
+ default |
191 |
+ if ! use audio-notify; then |
192 |
+ rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory" |
193 |
+ fi |
194 |
+} |