* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/, media-sound/ncmpcpp/files/
@ 2020-05-09 14:57 Louis Sautier
0 siblings, 0 replies; 2+ messages in thread
From: Louis Sautier @ 2020-05-09 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 686a9fd142ec10330e8f82e0473dc91b8a1495b8
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 13:05:27 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat May 9 14:57:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686a9fd1
media-sound/ncmpcpp: fix build with GCC 10
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Acked-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch | 26 ++++++++++++++++++++++
media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild | 13 ++++++-----
media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild | 11 ++++-----
3 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
new file mode 100644
index 00000000000..466abceecfe
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
@@ -0,0 +1,26 @@
+From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 9 May 2020 14:31:52 +0200
+Subject: [PATCH] Fix build with GCC 10 by adding missing include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following error:
+./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
+---
+ src/mpdpp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mpdpp.h b/src/mpdpp.h
+index a2bb79eb..abd3666c 100644
+--- a/src/mpdpp.h
++++ b/src/mpdpp.h
+@@ -25,6 +25,7 @@
+ #include <exception>
+ #include <random>
+ #include <set>
++#include <stdexcept>
+ #include <vector>
+
+ #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 6ca6ada7832..1593220f204 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
HOMEPAGE="https://rybczak.net/ncmpcpp/"
@@ -24,10 +24,11 @@ RDEPEND="
taglib? ( media-libs/taglib )
visualizer? ( sci-libs/fftw:3.0= )
"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc10.patch" )
src_prepare() {
default
@@ -56,7 +57,7 @@ src_install() {
pkg_postinst() {
echo
elog "Example configuration files have been installed at"
- elog "${ROOT}usr/share/doc/${PF}"
+ elog "${EROOT}/usr/share/doc/${PF}"
elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
elog "as user configuration files."
echo
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 55b91f7c614..5b38962ff92 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -23,10 +23,11 @@ RDEPEND="
taglib? ( media-libs/taglib )
visualizer? ( sci-libs/fftw:3.0= )
"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
src_prepare() {
default
@@ -53,7 +54,7 @@ src_install() {
pkg_postinst() {
echo
elog "Example configuration files have been installed at"
- elog "${ROOT}/usr/share/doc/${PF}"
+ elog "${EROOT}/usr/share/doc/${PF}"
elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
elog "as user configuration files."
echo
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/, media-sound/ncmpcpp/files/
@ 2024-07-18 7:50 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2024-07-18 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 48cd859f8dc398625cab4ada93956fdd2ca72a7d
Author: gentoo-setan <gentoo-setan <AT> protonmail <DOT> com>
AuthorDate: Mon Jun 17 06:36:04 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 07:48:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cd859f
media-sound/ncmpcpp: remove 0.9.2-r3
Signed-off-by: gentoo-setan <gentoo-setan <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/ncmpcpp/Manifest | 1 -
media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch | 56 -----------------
media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild | 73 -----------------------
3 files changed, 130 deletions(-)
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index d546f39f4293..b4fa24e37a75 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,2 +1 @@
-DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
DIST ncmpcpp-0.9.2_p20221231.gh.tar.gz 229678 BLAKE2B edb03554a14b90fbb5a4c99cb46ed73ffd702ff2fa417765d4e4bdaddd6bc40554f18aae10db81af87bbc8c91a4f966785fefdf43cfc97b18fc950c1aa59a370 SHA512 8affb5115c7531ee005544f002068b0b13b6aa41c5e11213ba8c979373a5328f298612903e531b6d384749469d6fa0ddb0d06ac4dac5ab2ca5485c7814db32a3
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
deleted file mode 100644
index 3a3c55e923d9..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 8796a4469795dfb067d02e19ddb3ae380d9b2fc3 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 10 Nov 2022 23:58:33 +0000
-Subject: [PATCH] Check for taglib with pkg-config before trying taglib-config
-
-Programs like taglib-config are not good when cross-compiling.
----
- configure.ac | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ef0c52b7..193840e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
-
- # taglib
- if test "$taglib" != "no" ; then
-- AC_PATH_PROG(TAGLIB_CONFIG, taglib-config)
-- if test "$TAGLIB_CONFIG" != "" ; then
-- CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`"
-- LIBS="$LIBS `$TAGLIB_CONFIG --libs`"
-+ PKG_CHECK_MODULES([taglib], [taglib], [
-+ AC_SUBST(taglib_CFLAGS)
-+ AC_SUBST(taglib_LIBS)
-+ ], [
-+ AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
-+ if test "$TAGLIB_CONFIG" != ""; then
-+ taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
-+ taglib_LIBS=`$TAGLIB_CONFIG --libs`
-+ else
-+ if test "$taglib" = "yes" ; then
-+ AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
-+ fi
-+ fi
-+ ])
-+
-+ if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
-+ CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
-+ LIBS="$LIBS $taglib_LIBS"
-+
- AC_CHECK_HEADERS([taglib.h], ,
- if test "$taglib" = "yes" ; then
- AC_MSG_ERROR([missing taglib.h header])
- fi
- )
-- else
-- if test "$taglib" = "yes" ; then
-- AC_MSG_ERROR([taglib-config executable is missing])
-- fi
- fi
- fi
-
---
-2.38.1
-
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
deleted file mode 100644
index 88dfc6c7e3b7..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="
- https://rybczak.net/ncmpcpp/
- https://github.com/ncmpcpp/ncmpcpp/
-"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
- >=media-libs/libmpdclient-2.1
- dev-libs/boost:=[icu,nls]
- dev-libs/icu:=
- net-misc/curl
- sys-libs/ncurses:=[unicode(+)]
- sys-libs/readline:=
- taglib? ( media-libs/taglib )
- visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-taglib-pc.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
- sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
- # --with-lto only appends -flto
- econf \
- $(use_enable clock) \
- $(use_enable outputs) \
- $(use_enable visualizer) \
- --without-lto \
- $(use_with taglib) \
- $(use_with visualizer fftw)
-}
-
-src_install() {
- default
-
- dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files have been installed at"
- elog "${EROOT}/usr/share/doc/${PF}"
- elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
- elog "as user configuration files."
- echo
- if use visualizer; then
- elog "If you want to use the visualizer, you need mpd with fifo enabled."
- echo
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-18 7:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-09 14:57 [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/, media-sound/ncmpcpp/files/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2024-07-18 7:50 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox