Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b43f723f798cc31eae8b526f98c94a889fac3575)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b43f723f798cc31eae8b526f98c94a889fac3575)
  • Date: Sat, 11 Sep 2021 19:55:22 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-players/ncmpcpp/DEPENDS | 15 +++++++-----
audio-players/ncmpcpp/HISTORY | 5 ++++
audio-players/ncmpcpp/PRE_BUILD | 9 -------
audio-players/ncmpcpp/cxx11.patch | 47
--------------------------------------
4 files changed, 14 insertions(+), 62 deletions(-)

New commits:
commit b43f723f798cc31eae8b526f98c94a889fac3575
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ncmpcpp: Request GCC 4.7+ and remove cxx11.patch

commit f4bce1b174c4ea68e74fe8bc091941d392b361fc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ncmpcpp: Convert to vdepends

diff --git a/audio-players/ncmpcpp/DEPENDS b/audio-players/ncmpcpp/DEPENDS
index 861db76..477e9dd 100755
--- a/audio-players/ncmpcpp/DEPENDS
+++ b/audio-players/ncmpcpp/DEPENDS
@@ -1,9 +1,12 @@
-depends icu &&
-depends ncurses &&
-depends readline &&
-depends libmpdclient &&
-depends -sub CXX gcc &&
-depends -sub "DATE_TIME REGEX SYSTEM FILESYSTEM LOCALE PROGRAM_OPTIONS
THREAD" boost &&
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends <<! &&
+ icu
+ ncurses
+ readline
+ libmpdclient
+ gcc[CXX] >= 4.7
+ boost[DATE_TIME,REGEX,SYSTEM,FILESYSTEM,LOCALE,PROGRAM_OPTIONS,THREAD]
+!

optional_depends curl \
"--with-curl" \
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index ba2f360..9a7cab8 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,8 @@
+2021-09-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: converted to vdepends
+ request GCC 4.7+
+ * PRE_BUILD, cxx11.patch: removed, no longer needed
+
2021-08-15 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: needs date_time and regex in boost

diff --git a/audio-players/ncmpcpp/PRE_BUILD b/audio-players/ncmpcpp/PRE_BUILD
deleted file mode 100755
index d4f23a5..0000000
--- a/audio-players/ncmpcpp/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# see https://gcc.gnu.org/projects/cxx0x.html
-if spell_ok gcc && is_version_less $(installed_version gcc) 4.7; then
- patch -p0 < "$SPELL_DIRECTORY/cxx11.patch"
-fi
diff --git a/audio-players/ncmpcpp/cxx11.patch
b/audio-players/ncmpcpp/cxx11.patch
deleted file mode 100644
index 2535b7c..0000000
--- a/audio-players/ncmpcpp/cxx11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/bindings.h.orig 2015-03-02 21:02:17.000000000 +0300
-+++ src/bindings.h 2015-04-27 19:54:04.000000000 +0300
-@@ -77,13 +77,14 @@
- typedef std::vector<Actions::BaseAction *> ActionChain;
-
- template <typename ArgT>
-- Binding(ArgT &&actions)
-- : m_actions(std::forward<ArgT>(actions)) {
-- assert(!m_actions.empty());
-+ Binding(ArgT &&actions) {
-+ super_init(actions);
- }
-- Binding(Actions::Type at)
-- : Binding(ActionChain({&Actions::get(at)})) { }
--
-+
-+ Binding(Actions::Type at) {
-+ super_init(ActionChain({&Actions::get(at)}));
-+ }
-+
- bool execute() const {
- return std::all_of(m_actions.begin(), m_actions.end(),
- boost::bind(&Actions::BaseAction::execute, _1)
-@@ -100,6 +101,12 @@
- }
-
- private:
-+ template <typename ArgT>
-+ void super_init(ArgT &&actions) {
-+ m_actions = std::forward<ArgT>(actions);
-+ assert(!m_actions.empty());
-+ }
-+
- ActionChain m_actions;
- };
-
---- src/utility/conversion.h.orig 2015-03-02 21:02:17.000000000 +0300
-+++ src/utility/conversion.h 2015-04-27 19:51:38.000000000 +0300
-@@ -41,6 +41,8 @@
-
- struct OutOfBounds : std::exception
- {
-+ ~OutOfBounds() throw() { }
-+
- const std::string &errorMessage() { return m_error_message; }
-
- template <typename Type>



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b43f723f798cc31eae8b526f98c94a889fac3575), Ismael Luceno, 09/11/2021

Archive powered by MHonArc 2.6.24.

Top of Page