Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 x11-toolkits/pygtk2/BUILD     |    2 +-
 x11-toolkits/pygtk2/DEPENDS   |    5 +++--
 x11-toolkits/pygtk2/DETAILS   |    3 +--
 x11-toolkits/pygtk2/HISTORY   |    9 ++++++++-
 x11-toolkits/pygtk2/PRE_BUILD |    3 +++
 5 files changed, 16 insertions(+), 6 deletions(-)

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

    pygtk2: Fix build and installation issues

diff --git a/x11-toolkits/pygtk2/BUILD b/x11-toolkits/pygtk2/BUILD
index f302b4f..d4d731b 100755
--- a/x11-toolkits/pygtk2/BUILD
+++ b/x11-toolkits/pygtk2/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --enable-thread PYTHON=/usr/bin/python2"  &&
+OPTS+=' --enable-thread' &&
 default_build
diff --git a/x11-toolkits/pygtk2/DEPENDS b/x11-toolkits/pygtk2/DEPENDS
index 30ae1a3..2d4c1ec 100755
--- a/x11-toolkits/pygtk2/DEPENDS
+++ b/x11-toolkits/pygtk2/DEPENDS
@@ -1,10 +1,11 @@
-depends python     &&
+depends python PYTHON=python2 &&
 depends atk        &&
 depends pango      &&
 depends pygobject  &&
 depends gtk+2      &&
 depends libglade2  &&
-depends pycairo    &&
+# XXX dead dependency; not worth making a spell for py2
+#depends pycairo    &&
 
 optional_depends numpy                           \
                  ""                              \
diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS
index c2edc1a..b54d49a 100755
--- a/x11-toolkits/pygtk2/DETAILS
+++ b/x11-toolkits/pygtk2/DETAILS
@@ -1,9 +1,8 @@
            SPELL=pygtk2
          VERSION=2.24.0
       
SOURCE_HASH=sha512:64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=pygtk-$VERSION.tar.bz2
-   SOURCE_URL[0]=$GNOME_URL/sources/pygtk/$BRANCH/$SOURCE
+   SOURCE_URL[0]=$GNOME_URL/sources/pygtk/${VERSION%.*}/$SOURCE
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/pygtk-$VERSION"
         WEB_SITE=http://www.pygtk.org/
diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY
index e7a726f..0eb6632 100644
--- a/x11-toolkits/pygtk2/HISTORY
+++ b/x11-toolkits/pygtk2/HISTORY
@@ -1,4 +1,11 @@
-2020-12-25 Ismael Luceno <ismael AT iodev.co.uk>
+2021-08-24 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD, DEPENDS: moved PYTHON var to DEPENDS
+       * DETAILS: removed var BRANCH
+       * DEPENDS: removed pycairo
+       * PRE_BUILD: disabled examples to fix installation failure
+         forcibly add gtk dir for pygtk headers (due to missing pycairo)
+
+2020-12-25 Ismael Luceno <ismael AT sourcemage.org>
        * PRE_BUILD: Fixed building against newer pango versions
          Fixed building against musl
 
diff --git a/x11-toolkits/pygtk2/PRE_BUILD b/x11-toolkits/pygtk2/PRE_BUILD
index 17d5fe9..fcda85d 100755
--- a/x11-toolkits/pygtk2/PRE_BUILD
+++ b/x11-toolkits/pygtk2/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+# XXX disable examples, causes build failures
+# XXX forcibly add gtk due to missing pycairo
+sedit '/^SUBDIRS =/{s/ examples / gtk /}' Makefile.in &&
 # Adapt to APIs removed from Pango (taken from BLFS)
 sedit '1394,1402 d' pango.defs &&
 # Fix config.sub for musl