* [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/
@ 2022-01-07 5:14 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-01-07 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 2aa83595c25847b0df884935a90bbe2f94eb17c0
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Tue Dec 21 21:59:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 7 05:06:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa83595
net-im/toxic: Removed old version 0.8.3
Closes: https://bugs.gentoo.org/827058
Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-im/toxic/Manifest | 1 -
.../files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch | 49 -------------
net-im/toxic/toxic-0.8.3-r3.ebuild | 85 ----------------------
3 files changed, 135 deletions(-)
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 5f20858fcd7b..4247de967283 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,3 +1,2 @@
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.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 11dc43c6b778..000000000000
--- a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/toxic-0.8.3-r3.ebuild b/net-im/toxic/toxic-0.8.3-r3.ebuild
deleted file mode 100644
index 97ed2aa0ae38..000000000000
--- a/net-im/toxic/toxic-0.8.3-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,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="notification python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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:= )
- sound? (
- media-libs/freealut
- media-libs/openal
- net-libs/tox:=[av]
- )
- video? (
- media-libs/libvpx:=
- net-libs/tox:=[av]
- 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 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() {
- export USER_CFLAGS="${CFLAGS}"
- export USER_LDFLAGS="${LDFLAGS}"
- if ! use sound; then
- export DISABLE_AV=1
- export DISABLE_SOUND_NOTIFY=1
- fi
- if ! use video; then
- export DISABLE_VI=1
- fi
- if ! use X; then
- export DISABLE_X11=1
- fi
- if ! use notification; then
- export DISABLE_DESKTOP_NOTIFY=1
- fi
- if ! use qrcode; then
- export DISABLE_QRCODE=1
- export DISABLE_QRPNG=1
- fi
- if use python; then
- export ENABLE_PYTHON=1
- fi
- #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 sound; then
- rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/
@ 2022-01-07 5:14 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-01-07 5:14 UTC (permalink / raw
To: gentoo-commits
commit: dc58609e3079ec90ef2a2dbbfc96fbfae8f0237e
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Wed Dec 29 16:01:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <JoMull01 <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23460
Signed-off-by: Sam James <sam <AT> 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 <sys/dir.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
++++ src/file_transfers.h
+@@ -25,6 +25,10 @@
+
+ #include <limits.h>
+
++#ifdef __linux__
++#include <linux/limits.h>
++#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 <limits.h>
+
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+
+ /* 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/
@ 2022-06-16 16:32 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-16 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 0a0089c78e73cfb83e3b873bb95c7583e08fff0d
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Wed Jun 15 21:25:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:31:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0089c7
net-im/toxic: remove old version 0.10.1-r1
Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-im/toxic/Manifest | 1 -
.../files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch | 49 ---------
net-im/toxic/toxic-0.10.1-r1.ebuild | 112 ---------------------
3 files changed, 162 deletions(-)
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index cec989e95f38..21f2738184f9 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,3 +1,2 @@
-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.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 68cb0bb59ccc..000000000000
--- a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/toxic-0.10.1-r1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
deleted file mode 100644
index 931dd62fc29a..000000000000
--- a/net-im/toxic/toxic-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,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 doc 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-libs/ncurses:=
- sys-kernel/linux-headers
- 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 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() {
- if ! use audio-notify; then
- USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
- fi
- if use debug; then
- USER_CFLAGS+="-DENABLE_RELEASE=0 "
- if use llvm; then
- USER_CFLAGS+="-DENABLE_ASAN=1 "
- fi
- fi
- if ! use notification; then
- USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
- fi
- if ! use png; then
- USER_CFLAGS+="-DDISABLE_QRPNG=1 "
- fi
- if use python; then
- USER_CFLAGS+="-DENABLE_PYTHON=1"
- fi
- if ! use qrcode; then
- USER_CFLAGS+="-DDISABLE_QRCODE=1"
- fi
- if ! use sound; then
- USER_CFLAGS+="-DDISABLE_AV=1 "
- fi
- if ! use video; then
- USER_CFLAGS+="-DDISABLE_VI=1"
- fi
- if ! use X; then
- USER_CFLAGS+="-DDISABLE_X11=1 "
- fi
- USER_CFLAGS+="${CFLAGS}"
- export USER_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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/
@ 2024-07-30 19:09 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2024-07-30 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 844802e50cbd1844804facdead6356d40c6e407f
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Wed Apr 24 22:27:06 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 19:01:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844802e5
net-im/toxic: Removed old version
Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-im/toxic/Manifest | 1 -
.../files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch | 48 ---------
net-im/toxic/toxic-0.11.1-r1.ebuild | 117 ---------------------
3 files changed, 166 deletions(-)
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 21f2738184f9..96ac83a8f936 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,2 +1 @@
-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.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 09845d294a2e..000000000000
--- a/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/toxic-0.11.1-r1.ebuild b/net-im/toxic/toxic-0.11.1-r1.ebuild
deleted file mode 100644
index 1a535eb7fcaa..000000000000
--- a/net-im/toxic/toxic-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-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
- #include strings.h fixes undefined reference to strcasecmp()
- #defining _GNU_SOURCE fixes undefined reference to strcasestr()
- export USER_CFLAGS="${CFLAGS} -include strings.h -D _GNU_SOURCE"
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-30 19:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-07 5:14 [gentoo-commits] repo/gentoo:master commit in: net-im/toxic/, net-im/toxic/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-30 19:09 Pacho Ramos
2022-06-16 16:32 Sam James
2022-01-07 5:14 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox