commit: 3f301ee3c2010a37ae4ebd43301afca7b77a60a3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 19 18:48:55 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 21 17:45:46 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f301ee3
media-sound/vimpc: drop 0.09.2-r3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/vimpc/Manifest | 1 - media-sound/vimpc/files/vimpc-0.09.2-boost.patch | 217 --------------------- .../files/vimpc-0.09.2-wformat-security.patch | 103 ---------- media-sound/vimpc/vimpc-0.09.2-r3.ebuild | 56 ------ 4 files changed, 377 deletions(-) diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest index 91e00d2a67e1..775db814aabb 100644 --- a/media-sound/vimpc/Manifest +++ b/media-sound/vimpc/Manifest @@ -1,2 +1 @@ -DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9 DIST vimpc-0.09.2_p20230330-95ad78d1.tar.gz 454098 BLAKE2B ab9594201b034c065b39c24c30cf275746edb9d46b9cff5e2f7665de6e285864fb8289d20457bdf990d274c0a9930155a77319b2a8c783f23c3ba8c08773fffd SHA512 df19aca227c2a4c821482a7f8c4d92c1f83ba79b8aca8ece26df3bef25cc8482195e5ab3332aa67b2598809eb533f2f94c38ed05fdf36aa7593f602451c2cd33 diff --git a/media-sound/vimpc/files/vimpc-0.09.2-boost.patch b/media-sound/vimpc/files/vimpc-0.09.2-boost.patch deleted file mode 100644 index 8df2eddd54c7..000000000000 --- a/media-sound/vimpc/files/vimpc-0.09.2-boost.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 300fe8890c8f93e01c445e4df6c3b1414a6115ba Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <[email protected]> -Date: Fri, 26 Jul 2019 03:26:22 +0300 -Subject: [PATCH] Fix building with boost (#87) - -Upstream-Status: Submitted -[https://github.com/boysetsfrog/vimpc/pull/88] -Signed-off-by: Stefan Strogin <[email protected]> ---- - configure.ac | 3 +- - m4/m4_ax_boost_chrono.m4 | 118 +++++++++++++++++++++++++++++++++++++++ - src/clientstate.cpp | 4 +- - src/clientstate.hpp | 2 +- - src/compiler.hpp | 4 ++ - 5 files changed, 127 insertions(+), 4 deletions(-) - create mode 100644 m4/m4_ax_boost_chrono.m4 - -diff --git a/configure.ac b/configure.ac -index c53c555..5e0b618 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ if test "x$enable_boost" = "xyes"; then - AC_DEFINE_UNQUOTED(BOOST_SUPPORT, "1", "Define to 1 if boost support enabled") - - AX_BOOST_BASE([], [], [AC_MSG_ERROR(vimpc requires boost library)]) -+AX_BOOST_CHRONO([], [], [AC_MSG_ERROR(vimpc requires boost chrono library)]) - AX_BOOST_SYSTEM([], [], [AC_MSG_ERROR(vimpc requires boost system library)]) - AX_BOOST_THREAD([], [], [AC_MSG_ERROR(vimpc requires boost thread library)]) - -@@ -73,7 +74,7 @@ AC_CHECK_HEADER(boost/function.hpp, - [AC_MSG_ERROR(boost-dev library is required)]) - - CPPFLAGS="$CPPFLAGS -DUSE_BOOST_THREAD -DUSE_BOOST_FUNCTIONAL -DUSE_BOOST_FOREACH" --LIBS="$LIBS $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB" -+LIBS="$LIBS $BOOST_CHRONO_LIB $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB" - - AC_MSG_CHECKING([whether compiler supports lambda functions]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/function.hpp>]], [[int a = 5; boost::function<int(int)> f = [&a](int b) { return a + b; }; f(8);]])], -diff --git a/m4/m4_ax_boost_chrono.m4 b/m4/m4_ax_boost_chrono.m4 -new file mode 100644 -index 0000000..6ea77b9 ---- /dev/null -+++ b/m4/m4_ax_boost_chrono.m4 -@@ -0,0 +1,118 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_BOOST_CHRONO -+# -+# DESCRIPTION -+# -+# Test for Chrono library from the Boost C++ libraries. The macro requires -+# a preceding call to AX_BOOST_BASE. Further documentation is available at -+# <http://randspringer.de/boost/index.html>. -+# -+# This macro calls: -+# -+# AC_SUBST(BOOST_CHRONO_LIB) -+# -+# And sets: -+# -+# HAVE_BOOST_CHRONO -+# -+# LICENSE -+# -+# Copyright (c) 2012 Xiyue Deng <[email protected]> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 4 -+ -+AC_DEFUN([AX_BOOST_CHRONO], -+[ -+ AC_ARG_WITH([boost-chrono], -+ AS_HELP_STRING([--with-boost-chrono@<:@=special-lib@:>@], -+ [use the Chrono library from boost - it is possible to specify a certain library for the linker -+ e.g. --with-boost-chrono=boost_chrono-gcc-mt ]), -+ [ -+ if test "$withval" = "no"; then -+ want_boost="no" -+ elif test "$withval" = "yes"; then -+ want_boost="yes" -+ ax_boost_user_chrono_lib="" -+ else -+ want_boost="yes" -+ ax_boost_user_chrono_lib="$withval" -+ fi -+ ], -+ [want_boost="yes"] -+ ) -+ -+ if test "x$want_boost" = "xyes"; then -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_REQUIRE([AC_CANONICAL_BUILD]) -+ CPPFLAGS_SAVED="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" -+ export CPPFLAGS -+ -+ LDFLAGS_SAVED="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" -+ export LDFLAGS -+ -+ AC_CACHE_CHECK(whether the Boost::Chrono library is available, -+ ax_cv_boost_chrono, -+ [AC_LANG_PUSH([C++]) -+ CXXFLAGS_SAVE=$CXXFLAGS -+ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]], -+ [[boost::chrono::system_clock::time_point* time = new boost::chrono::system_clock::time_point; delete time;]])], -+ ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no) -+ CXXFLAGS=$CXXFLAGS_SAVE -+ AC_LANG_POP([C++]) -+ ]) -+ if test "x$ax_cv_boost_chrono" = "xyes"; then -+ AC_SUBST(BOOST_CPPFLAGS) -+ -+ AC_DEFINE(HAVE_BOOST_CHRONO,,[define if the Boost::Chrono library is available]) -+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` -+ -+ LDFLAGS_SAVE=$LDFLAGS -+ if test "x$ax_boost_user_chrono_lib" = "x"; then -+ for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do -+ ax_lib=${libextension} -+ AC_CHECK_LIB($ax_lib, exit, -+ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], -+ [link_chrono="no"]) -+ done -+ if test "x$link_chrono" != "xyes"; then -+ for libextension in `ls $BOOSTLIBDIR/boost_chrono*.dll* $BOOSTLIBDIR/boost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_chrono.*\)\.dll.*$;\1;' -e 's;^\(boost_chrono.*\)\.a.*$;\1;'` ; do -+ ax_lib=${libextension} -+ AC_CHECK_LIB($ax_lib, exit, -+ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], -+ [link_chrono="no"]) -+ done -+ fi -+ -+ else -+ for ax_lib in $ax_boost_user_chrono_lib boost_chrono-$ax_boost_user_chrono_lib; do -+ AC_CHECK_LIB($ax_lib, exit, -+ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], -+ [link_chrono="no"]) -+ done -+ -+ fi -+ if test "x$ax_lib" = "x"; then -+ AC_MSG_ERROR(Could not find a version of the library!) -+ fi -+ if test "x$link_chrono" = "xno"; then -+ AC_MSG_ERROR(Could not link against $ax_lib !) -+ fi -+ fi -+ -+ CPPFLAGS="$CPPFLAGS_SAVED" -+ LDFLAGS="$LDFLAGS_SAVED" -+ fi -+]) -diff --git a/src/clientstate.cpp b/src/clientstate.cpp -index 357dd6b..d00c981 100644 ---- a/src/clientstate.cpp -+++ b/src/clientstate.cpp -@@ -223,10 +223,10 @@ ClientState::ClientState(Main::Vimpc * vimpc, Main::Settings & settings, Ui::Scr - Main::Vimpc::CreateEvent(Event::StatusUpdate, EData); - }); - -- updateThread_ = std::thread([this]() { -+ updateThread_ = Thread([this]() { - while (this->running_) - { -- std::this_thread::sleep_for(std::chrono::milliseconds(this->waitTime_)); -+ ThisThread::sleep_for(Chrono::milliseconds(this->waitTime_)); - - if (this->newSong_) - { -diff --git a/src/clientstate.hpp b/src/clientstate.hpp -index 0bcbd5b..1983372 100644 ---- a/src/clientstate.hpp -+++ b/src/clientstate.hpp -@@ -122,7 +122,7 @@ namespace Mpc - std::string currentSongURI_; - std::string currentState_; - std::string lastTitleStr_; -- std::thread updateThread_; -+ Thread updateThread_; - }; - } - -diff --git a/src/compiler.hpp b/src/compiler.hpp -index 8a38c20..09472f8 100644 ---- a/src/compiler.hpp -+++ b/src/compiler.hpp -@@ -47,6 +47,8 @@ typedef boost::mutex Mutex; - typedef boost::recursive_mutex RecursiveMutex; - typedef boost::condition_variable ConditionVariable; - #define Atomic(X) X -+#define Chrono boost::chrono -+#define ThisThread boost::this_thread - #define UniqueLock boost::unique_lock - - template <typename T> -@@ -60,6 +62,8 @@ typedef std::mutex Mutex; - typedef std::recursive_mutex RecursiveMutex; - typedef std::condition_variable ConditionVariable; - #define Atomic(X) std::atomic<X> -+#define Chrono std::chrono -+#define ThisThread std::this_thread - #define UniqueLock std::unique_lock - - template <typename T> --- -2.22.0 - diff --git a/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch b/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch deleted file mode 100644 index 2d8c09e416e5..000000000000 --- a/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch +++ /dev/null @@ -1,103 +0,0 @@ -https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b - -From 055ecdce0720fdfc9ec2528c520b6c33da36271b Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Wed, 3 Nov 2021 08:25:58 +0000 -Subject: [PATCH] vimpc: always use "%s"-style format for printf()-style - functions - -`ncuses-6.3` added printf-style function attributes and now makes -it easier to catch cases when user input is used in palce of format -string when built with CFLAGS=-Werror=format-security: - - src/window/listwindow.cpp:120:16: - error: format not a string literal and no format arguments [-Werror=format-security] - 120 | mvwprintw(window, line, 0, BlankLine.c_str()); - | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Let's wrap all the missing places with "%s" format. ---- a/src/screen.cpp -+++ b/src/screen.cpp -@@ -1489,7 +1489,7 @@ void Screen::ClearStatus() const - wattron(statusWindow_, A_REVERSE); - } - -- mvwprintw(statusWindow_, 0, 0, BlankLine.c_str()); -+ mvwprintw(statusWindow_, 0, 0, "%s", BlankLine.c_str()); - - if (settings_.Get(Setting::ColourEnabled) == true) - { -@@ -1516,7 +1516,7 @@ void Screen::UpdateTabWindow() const - wattron(tabWindow_, COLOR_PAIR(settings_.colours.TabWindow)); - } - -- mvwprintw(tabWindow_, 0, 0, BlankLine.c_str()); -+ mvwprintw(tabWindow_, 0, 0, "%s", BlankLine.c_str()); - wmove(tabWindow_, 0, 0); - - std::string name = ""; ---- a/src/window/directorywindow.cpp -+++ b/src/window/directorywindow.cpp -@@ -220,8 +220,8 @@ void DirectoryWindow::Print(uint32_t line) const - - wattron(window, A_BOLD); - std::string const Directory = "/" + directory_.CurrentDirectory(); -- mvwprintw(window, line, 0, BlankLine.c_str()); -- mvwprintw(window, line, 1, Directory.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); -+ mvwprintw(window, line, 1, "%s", Directory.c_str()); - wattroff(window, A_BOLD); - - if (settings_.Get(Setting::ColourEnabled) == true) -@@ -250,7 +250,7 @@ void DirectoryWindow::Print(uint32_t line) const - wattron(window, A_REVERSE); - } - -- mvwprintw(window, line, 0, BlankLine.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); - - uint8_t expandCol = 1; - -@@ -276,7 +276,7 @@ void DirectoryWindow::Print(uint32_t line) const - } - else - { -- mvwprintw(window, line, 0, BlankLine.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); - } - } - } ---- a/src/window/help.cpp -+++ b/src/window/help.cpp -@@ -64,7 +64,7 @@ void HelpWindow::Print(uint32_t line) const - WINDOW * window = N_WINDOW(); - - std::string const BlankLine(Columns(), ' '); -- mvwprintw(window, line, 0, BlankLine.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); - wmove(window, line, 0); - - if ((FirstLine() + line) < help_.Size()) ---- a/src/window/listwindow.cpp -+++ b/src/window/listwindow.cpp -@@ -117,7 +117,7 @@ void ListWindow::Print(uint32_t line) const - else - { - std::string const BlankLine(Columns(), ' '); -- mvwprintw(window, line, 0, BlankLine.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); - } - #else - SelectWindow::Print(line); ---- a/src/window/lyricswindow.cpp -+++ b/src/window/lyricswindow.cpp -@@ -61,7 +61,7 @@ void LyricsWindow::Print(uint32_t line) const - WINDOW * window = N_WINDOW(); - - std::string const BlankLine(Columns(), ' '); -- mvwprintw(window, line, 0, BlankLine.c_str()); -+ mvwprintw(window, line, 0, "%s", BlankLine.c_str()); - wmove(window, line, 0); - - if ((FirstLine() == 0) && (line == 0)) - diff --git a/media-sound/vimpc/vimpc-0.09.2-r3.ebuild b/media-sound/vimpc/vimpc-0.09.2-r3.ebuild deleted file mode 100644 index 49bf0e3b156e..000000000000 --- a/media-sound/vimpc/vimpc-0.09.2-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="An ncurses based mpd client with vi-like key bindings" -HOMEPAGE="https://github.com/boysetsfrog/vimpc"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/boysetsfrog/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="boost taglib" - -RDEPEND=" - dev-libs/libpcre - media-libs/libmpdclient - boost? ( dev-libs/boost:= ) - taglib? ( media-libs/taglib:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-boost.patch - "${FILESDIR}"/${P}-wformat-security.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Tests here seem to make cppunit linked into the main vimpc binary - # Not clear how to run them either - econf \ - $(use_enable boost) \ - $(use_enable taglib) \ - --disable-test -} - -src_install() { - local DOCS=( AUTHORS README.md doc/vimpcrc.example ) - default - - # vimpc will look for help.txt - docompress -x /usr/share/doc/${PF}/help.txt -}
