sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (633e2f2f7cc7541475894173c1c3cc4ea9749461)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (633e2f2f7cc7541475894173c1c3cc4ea9749461)
Date: Mon, 30 Jul 2018 14:05:27 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

x11/polybar/DETAILS | 5 -
x11/polybar/HISTORY | 6 +
x11/polybar/PRE_BUILD | 3
x11/polybar/cmake.patch | 13 ---
x11/polybar/pid-token.patch | 147
-----------------------------------
x11/polybar/xworkspaces-scroll.patch | 15 ---
6 files changed, 8 insertions(+), 181 deletions(-)

New commits:
commit 633e2f2f7cc7541475894173c1c3cc4ea9749461
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

polybar: => 3.2.1

diff --git a/x11/polybar/DETAILS b/x11/polybar/DETAILS
index 2ab2b75..36c88f9 100755
--- a/x11/polybar/DETAILS
+++ b/x11/polybar/DETAILS
@@ -1,9 +1,8 @@
SPELL=polybar
- VERSION=3.1.0
- PATCHLEVEL=2
+ VERSION=3.2.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/jaagr/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
+
SOURCE_HASH=sha512:e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
SPELL_LIB1=xpp
SPELL_LIB1_V=1.4.0
SOURCE2=${SPELL_LIB1}-${SPELL_LIB1_V}.tar.gz
diff --git a/x11/polybar/HISTORY b/x11/polybar/HISTORY
index 2bdf768..1013b5c 100644
--- a/x11/polybar/HISTORY
+++ b/x11/polybar/HISTORY
@@ -1,3 +1,9 @@
+2018-07-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.1
+ * PRE_BUILD: dropped several patches
+ * cmake.patch, pid-token.patch, xworkspaces-scroll.patch: removed,
+ fixed by upstream
+
2018-05-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: apply patch
diff --git a/x11/polybar/PRE_BUILD b/x11/polybar/PRE_BUILD
index 29d3bab..dbede1c 100755
--- a/x11/polybar/PRE_BUILD
+++ b/x11/polybar/PRE_BUILD
@@ -1,10 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p0 < "${SPELL_DIRECTORY}/cmake.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/cmake-doc.patch" &&
-patch -p0 < "${SPELL_DIRECTORY}/xworkspaces-scroll.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/pid-token.patch" &&

verify_file 2 &&

diff --git a/x11/polybar/cmake.patch b/x11/polybar/cmake.patch
deleted file mode 100644
index ec3794e..0000000
--- a/x11/polybar/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/01-core.cmake.orig 2017-12-03 12:03:49.000000000 -0500
-+++ cmake/01-core.cmake 2018-02-01 15:48:32.296902831 -0500
-@@ -73,8 +73,8 @@
-
- if(ENABLE_CCACHE)
- querybin(ccache)
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${BINPATH_ccache})
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${BINPATH_ccache})
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
- endif()
-
- # Install paths
diff --git a/x11/polybar/pid-token.patch b/x11/polybar/pid-token.patch
deleted file mode 100644
index f5dd458..0000000
--- a/x11/polybar/pid-token.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From a519d07cfc699a3cb9cc129783e30b4eef4b1d77 Mon Sep 17 00:00:00 2001
-From: patrick96 <p.ziegler96 AT gmail.com>
-Date: Tue, 2 Jan 2018 13:52:34 +0100
-Subject: [PATCH 1/2] feat(script): Add %pid% token for tail commands
-
-Is replaced with the pid of the exec command
----
- include/modules/script.hpp | 2 ++
- src/modules/script.cpp | 27 ++++++++++++++++++++++++---
- 2 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/include/modules/script.hpp b/include/modules/script.hpp
-index c1ec50bc..d2db896e 100644
---- a/include/modules/script.hpp
-+++ b/include/modules/script.hpp
-@@ -29,6 +29,8 @@ namespace modules {
-
- unique_ptr<command> m_command;
-
-+ bool m_tail;
-+
- string m_exec;
- string m_exec_if;
-
-diff --git a/src/modules/script.cpp b/src/modules/script.cpp
-index 8a334305..0f0dfa20 100644
---- a/src/modules/script.cpp
-+++ b/src/modules/script.cpp
-@@ -13,9 +13,11 @@ namespace modules {
- */
- script_module::script_module(const bar_settings& bar, string name_)
- : module<script_module>(bar, move(name_)), m_handler([&]() ->
function<chrono::duration<double>()> {
-+
-+ m_tail = m_conf.get(name(), "tail", false);
- // Handler for continuous tail commands {{{
-
-- if (m_conf.get(name(), "tail", false)) {
-+ if (m_tail) {
- return [&] {
- if (!m_command || !m_command->is_running()) {
- string exec{string_util::replace_all(m_exec, "%counter%",
to_string(++m_counter))};
-@@ -174,19 +176,38 @@ namespace modules {
-
- if (!m_actions[mousebtn::LEFT].empty()) {
- m_builder->cmd(mousebtn::LEFT,
string_util::replace_all(m_actions[mousebtn::LEFT], "%counter%", cnt));
-+
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(mousebtn::LEFT,
string_util::replace_all(m_actions[mousebtn::LEFT], "%pid%",
std::to_string(m_command->get_pid())));
-+ }
- }
- if (!m_actions[mousebtn::MIDDLE].empty()) {
- m_builder->cmd(mousebtn::MIDDLE,
string_util::replace_all(m_actions[mousebtn::MIDDLE], "%counter%", cnt));
-+
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(mousebtn::MIDDLE,
string_util::replace_all(m_actions[mousebtn::MIDDLE], "%pid%",
std::to_string(m_command->get_pid())));
-+ }
- }
- if (!m_actions[mousebtn::RIGHT].empty()) {
- m_builder->cmd(mousebtn::RIGHT,
string_util::replace_all(m_actions[mousebtn::RIGHT], "%counter%", cnt));
-+
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(mousebtn::RIGHT,
string_util::replace_all(m_actions[mousebtn::RIGHT], "%pid%",
std::to_string(m_command->get_pid())));
-+ }
- }
- if (!m_actions[mousebtn::SCROLL_UP].empty()) {
- m_builder->cmd(mousebtn::SCROLL_UP,
string_util::replace_all(m_actions[mousebtn::SCROLL_UP], "%counter%", cnt));
-+
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(mousebtn::SCROLL_UP,
string_util::replace_all(m_actions[mousebtn::SCROLL_UP], "%pid%",
std::to_string(m_command->get_pid())));
-+ }
- }
- if (!m_actions[mousebtn::SCROLL_DOWN].empty()) {
-- m_builder->cmd(
-- mousebtn::SCROLL_DOWN,
string_util::replace_all(m_actions[mousebtn::SCROLL_DOWN], "%counter%", cnt));
-+ m_builder->cmd( mousebtn::SCROLL_DOWN,
string_util::replace_all(m_actions[mousebtn::SCROLL_DOWN], "%counter%", cnt));
-+
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(mousebtn::SCROLL_DOWN,
string_util::replace_all(m_actions[mousebtn::SCROLL_DOWN], "%pid%",
std::to_string(m_command->get_pid())));
-+ }
- }
-
- m_builder->append(output);
-
-From e1f4d81784a1363de14ed0d79e58096579545b7a Mon Sep 17 00:00:00 2001
-From: patrick96 <p.ziegler96 AT gmail.com>
-Date: Tue, 2 Jan 2018 14:05:14 +0100
-Subject: [PATCH 2/2] refactor(script): Loop over buttons and replace tokens
-
----
- src/modules/script.cpp | 41 +++++++++++------------------------------
- 1 file changed, 11 insertions(+), 30 deletions(-)
-
-diff --git a/src/modules/script.cpp b/src/modules/script.cpp
-index 0f0dfa20..669e9a8e 100644
---- a/src/modules/script.cpp
-+++ b/src/modules/script.cpp
-@@ -174,39 +174,20 @@ namespace modules {
- string cnt{to_string(m_counter)};
- string output{module::get_output()};
-
-- if (!m_actions[mousebtn::LEFT].empty()) {
-- m_builder->cmd(mousebtn::LEFT,
string_util::replace_all(m_actions[mousebtn::LEFT], "%counter%", cnt));
-+ for (auto btn : {mousebtn::LEFT, mousebtn::MIDDLE, mousebtn::RIGHT,
mousebtn::SCROLL_UP, mousebtn::SCROLL_DOWN}) {
-
-- if(m_tail && m_command && m_command->is_running()) {
-- m_builder->cmd(mousebtn::LEFT,
string_util::replace_all(m_actions[mousebtn::LEFT], "%pid%",
std::to_string(m_command->get_pid())));
-- }
-- }
-- if (!m_actions[mousebtn::MIDDLE].empty()) {
-- m_builder->cmd(mousebtn::MIDDLE,
string_util::replace_all(m_actions[mousebtn::MIDDLE], "%counter%", cnt));
-+ auto action = m_actions[btn];
-
-- if(m_tail && m_command && m_command->is_running()) {
-- m_builder->cmd(mousebtn::MIDDLE,
string_util::replace_all(m_actions[mousebtn::MIDDLE], "%pid%",
std::to_string(m_command->get_pid())));
-- }
-- }
-- if (!m_actions[mousebtn::RIGHT].empty()) {
-- m_builder->cmd(mousebtn::RIGHT,
string_util::replace_all(m_actions[mousebtn::RIGHT], "%counter%", cnt));
-+ if (!action.empty()) {
-+ m_builder->cmd(btn, string_util::replace_all(action, "%counter%",
cnt));
-
-- if(m_tail && m_command && m_command->is_running()) {
-- m_builder->cmd(mousebtn::RIGHT,
string_util::replace_all(m_actions[mousebtn::RIGHT], "%pid%",
std::to_string(m_command->get_pid())));
-- }
-- }
-- if (!m_actions[mousebtn::SCROLL_UP].empty()) {
-- m_builder->cmd(mousebtn::SCROLL_UP,
string_util::replace_all(m_actions[mousebtn::SCROLL_UP], "%counter%", cnt));
--
-- if(m_tail && m_command && m_command->is_running()) {
-- m_builder->cmd(mousebtn::SCROLL_UP,
string_util::replace_all(m_actions[mousebtn::SCROLL_UP], "%pid%",
std::to_string(m_command->get_pid())));
-- }
-- }
-- if (!m_actions[mousebtn::SCROLL_DOWN].empty()) {
-- m_builder->cmd( mousebtn::SCROLL_DOWN,
string_util::replace_all(m_actions[mousebtn::SCROLL_DOWN], "%counter%", cnt));
--
-- if(m_tail && m_command && m_command->is_running()) {
-- m_builder->cmd(mousebtn::SCROLL_DOWN,
string_util::replace_all(m_actions[mousebtn::SCROLL_DOWN], "%pid%",
std::to_string(m_command->get_pid())));
-+ /*
-+ * The pid token is only for tailed commands.
-+ * If the command is not specified or running, replacement is
unnecessary as well
-+ */
-+ if(m_tail && m_command && m_command->is_running()) {
-+ m_builder->cmd(btn, string_util::replace_all(action, "%pid%",
to_string(m_command->get_pid())));
-+ }
- }
- }
-
diff --git a/x11/polybar/xworkspaces-scroll.patch
b/x11/polybar/xworkspaces-scroll.patch
deleted file mode 100644
index 41932c2..0000000
--- a/x11/polybar/xworkspaces-scroll.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/xworkspaces.cpp.orig 2017-12-03 12:03:49.000000000 -0500
-+++ src/modules/xworkspaces.cpp 2018-02-03 17:10:40.250293021 -0500
-@@ -264,8 +264,10 @@
- output += module::get_output();
- }
-
-- m_builder->cmd(mousebtn::SCROLL_DOWN, string{EVENT_PREFIX} +
string{EVENT_SCROLL_DOWN});
-- m_builder->cmd(mousebtn::SCROLL_UP, string{EVENT_PREFIX} +
string{EVENT_SCROLL_UP});
-+ if (m_scroll) {
-+ m_builder->cmd(mousebtn::SCROLL_DOWN, string{EVENT_PREFIX} +
string{EVENT_SCROLL_DOWN});
-+ m_builder->cmd(mousebtn::SCROLL_UP, string{EVENT_PREFIX} +
string{EVENT_SCROLL_UP});
-+ }
-
- m_builder->append(output);
-

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (633e2f2f7cc7541475894173c1c3cc4ea9749461), Vlad Glagolev, 07/30/2018