Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 x11/polybar/DEPENDS       |    3 ++-
 x11/polybar/DETAILS       |   18 +++---------------
 x11/polybar/HISTORY       |    7 +++++++
 x11/polybar/PRE_BUILD     |   13 +------------
 x11/polybar/python2.patch |   22 ++++++++++++++++++++++
 5 files changed, 35 insertions(+), 28 deletions(-)

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

    polybar: => 3.5.1

diff --git a/x11/polybar/DEPENDS b/x11/polybar/DEPENDS
index 51ea11b..ac69521 100755
--- a/x11/polybar/DEPENDS
+++ b/x11/polybar/DEPENDS
@@ -1,7 +1,7 @@
 depends cmake &&
 depends pkgconfig &&
 # required for generating headers
-depends python &&
+depends python "-DPYTHON_EXECUTABLE=${INSTALL_ROOT}/usr/bin/python2" &&
 
 optional_depends llvm \
                  "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" \
@@ -47,6 +47,7 @@ optional_depends curl \
 
 if list_find "${POLYBAR_OPTS}" "-DENABLE_I3=ON"; then
   depends i3 &&
+  # required for building i3ipcpp
   depends jsoncpp
 fi &&
 
diff --git a/x11/polybar/DETAILS b/x11/polybar/DETAILS
index 7da31d4..bc68ed1 100755
--- a/x11/polybar/DETAILS
+++ b/x11/polybar/DETAILS
@@ -1,20 +1,8 @@
            SPELL=polybar
-         VERSION=3.4.3
+         VERSION=3.5.1
           SOURCE=${SPELL}-${VERSION}.tar.gz
-   
SOURCE_URL[0]=https://github.com/polybar/${SPELL}/archive/${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
-      SPELL_LIB1=xpp
-    SPELL_LIB1_V=1.4.0
-         SOURCE2=${SPELL_LIB1}-${SPELL_LIB1_V}.tar.gz
-     
SOURCE2_URL=https://github.com/polybar/${SPELL_LIB1}/archive/${SPELL_LIB1_V}.tar.gz
-    
SOURCE2_HASH=sha512:d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-if list_find "${POLYBAR_OPTS}" "-DENABLE_I3=ON"; then
-      SPELL_LIB2=i3ipcpp
-    SPELL_LIB2_V=0.7.1
-         SOURCE3=${SPELL_LIB2}-${SPELL_LIB2_V}.tar.gz
-     
SOURCE3_URL=https://github.com/polybar/${SPELL_LIB2}/archive/v${SPELL_LIB2_V}.tar.gz
-    
SOURCE3_HASH=sha512:ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
-fi
+   
SOURCE_URL[0]=https://github.com/polybar/${SPELL}/releases/download/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha256:d342fdb1d37a475f3460e00e82445a3f7be812961fec6e455b33277af3cda719:UPSTREAM_HASH
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
             DOCS="SUPPORT.md ${DOCS}"
         DOC_DIRS=""
diff --git a/x11/polybar/HISTORY b/x11/polybar/HISTORY
index c6bf519..babfe13 100644
--- a/x11/polybar/HISTORY
+++ b/x11/polybar/HISTORY
@@ -1,3 +1,10 @@
+2020-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.5.1; switch to full tarball from
+         sub-modules; switch to upstream hash verification
+       * DEPENDS: add jsoncpp; add Python full path
+       * PRE_BUILD: switch to full tarball from sub-modules
+       * python2.patch: added, to fix build with Python 2
+
 2020-05-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.4.3
        * CONFIGURE: added trace logging option
diff --git a/x11/polybar/PRE_BUILD b/x11/polybar/PRE_BUILD
index 55d830e..1c13144 100755
--- a/x11/polybar/PRE_BUILD
+++ b/x11/polybar/PRE_BUILD
@@ -1,15 +1,4 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
-verify_file 2 &&
-
-cd lib/xpp &&
-tar -xzf "${SOURCE_CACHE}/${SOURCE2}" --strip=1 &&
-cd .. &&
-
-if list_find "${POLYBAR_OPTS}" "-DENABLE_I3=ON"; then
-  verify_file 3 &&
-  cd i3ipcpp &&
-  tar -xzf "${SOURCE_CACHE}/${SOURCE3}" --strip=1 &&
-  cd ..
-fi
+patch -p0 < "${SPELL_DIRECTORY}/python2.patch"
diff --git a/x11/polybar/python2.patch b/x11/polybar/python2.patch
new file mode 100644
index 0000000..51a8fb5
--- /dev/null
+++ b/x11/polybar/python2.patch
@@ -0,0 +1,22 @@
+--- lib/xpp/CMakeLists.txt.orig        2020-12-12 04:16:10.000000000 -0800
++++ lib/xpp/CMakeLists.txt     2020-12-12 06:16:32.941122725 -0800
+@@ -24,7 +24,7 @@
+     pkg_get_variable(XCBPROTO_XCBINCLUDEDIR xcb-proto xcbincludedir)
+ endif()
+ 
+-find_package(PythonInterp 3.5 REQUIRED)
++find_package(PythonInterp 2.7 REQUIRED)
+ find_package(XCB REQUIRED XCB ICCCM EWMH UTIL IMAGE)
+ 
+ if(NOT PYTHON_EXECUTABLE)
+--- lib/xpp/generators/cpp_client.py.orig      2020-12-12 04:16:10.000000000 
-0800
++++ lib/xpp/generators/cpp_client.py   2020-12-12 06:19:43.304249600 -0800
+@@ -1,6 +1,8 @@
+ #!/usr/bin/env python
+ # vim: set ts=4 sws=4 sw=4:
+ 
++from __future__ import print_function
++
+ from xml.etree.ElementTree import *
+ from os.path import basename
+ from functools import reduce