From f0540c6ca7d2220a420537c68666e6dde3621585 Mon Sep 17 00:00:00 2001 From: Josiah Mullins Date: Wed, 29 Mar 2023 11:35:49 -0400 Subject: net-im/toxic: Fixes implicit function declaration This commit adds an include statement and a macro declaration to the USER_CFLAGS variable. The include statement includes strings.h for strcasecmp (see man strcasecmp). The macro declaration causes strcasestr to be included (see man strcasestr). Closes: https://bugs.gentoo.org/897856 Signed-off-by: Josiah Mullins Closes: https://github.com/gentoo/gentoo/pull/30400 Signed-off-by: Joonas Niilola --- net-im/toxic/toxic-0.11.1-r1.ebuild | 117 ++++++++++++++++++++++++++++++++++++ net-im/toxic/toxic-0.11.1.ebuild | 115 ----------------------------------- net-im/toxic/toxic-0.11.3-r1.ebuild | 117 ++++++++++++++++++++++++++++++++++++ net-im/toxic/toxic-0.11.3.ebuild | 115 ----------------------------------- 4 files changed, 234 insertions(+), 230 deletions(-) create mode 100644 net-im/toxic/toxic-0.11.1-r1.ebuild delete mode 100644 net-im/toxic/toxic-0.11.1.ebuild create mode 100644 net-im/toxic/toxic-0.11.3-r1.ebuild delete mode 100644 net-im/toxic/toxic-0.11.3.ebuild (limited to 'net-im/toxic') diff --git a/net-im/toxic/toxic-0.11.1-r1.ebuild b/net-im/toxic/toxic-0.11.1-r1.ebuild new file mode 100644 index 000000000000..1a535eb7fcaa --- /dev/null +++ b/net-im/toxic/toxic-0.11.1-r1.ebuild @@ -0,0 +1,117 @@ +# 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 +} diff --git a/net-im/toxic/toxic-0.11.1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild deleted file mode 100644 index fead2de553a3..000000000000 --- a/net-im/toxic/toxic-0.11.1.ebuild +++ /dev/null @@ -1,115 +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 - 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 -} diff --git a/net-im/toxic/toxic-0.11.3-r1.ebuild b/net-im/toxic/toxic-0.11.3-r1.ebuild new file mode 100644 index 000000000000..4a42d75791c5 --- /dev/null +++ b/net-im/toxic/toxic-0.11.3-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + #Including 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 +} diff --git a/net-im/toxic/toxic-0.11.3.ebuild b/net-im/toxic/toxic-0.11.3.ebuild deleted file mode 100644 index a436039ffa9e..000000000000 --- a/net-im/toxic/toxic-0.11.3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 - 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 -} -- cgit v1.2.3-65-gdbad