[jhbuild] core-deps: build python3-setuptools and make meson depend on it



commit e59f5e54a63f0035ee1204ea2b28956d5940ba1b
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Thu Sep 5 18:02:37 2019 +0200

    core-deps: build python3-setuptools and make meson depend on it
    
    See #6

 .gitlab-ci.yml                                   | 2 +-
 modulesets/gnome-suites-core-deps-latest.modules | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e337f971..1a987645 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ ubuntu-19.04-glib:
     - echo "use_local_modulesets = True" >> $HOME/.config/jhbuildrc
     - sudo apt-file update
     - jhbuild --no-interact --exit-on-error sysdeps --install --assume-yes glib
-    - sudo apt install -y zlib1g-dev docbook-xml docbook-xsl python3-setuptools
+    - sudo apt install -y zlib1g-dev docbook-xml docbook-xsl
     - jhbuild --no-interact --exit-on-error build glib
 
 pages:
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index f837fe4c..28ca76c8 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1712,6 +1712,14 @@
     </branch>
   </distutils>
 
+  <distutils id="python3-setuptools" python3="1">
+    <branch repo="pypi.org"
+            module="s/setuptools/setuptools-${version}.zip"
+            version="41.2.0"
+            checkoutdir="python3-setuptools-${version}"
+            hash="sha256:66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012"/>
+  </distutils>
+
   <distutils id="meson" python3="1">
     <branch repo="github-tar"
             version="0.51.2"
@@ -1721,6 +1729,7 @@
     </branch>
     <dependencies>
       <dep package="ninja"/>
+      <dep package="python3-setuptools"/>
     </dependencies>
   </distutils>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]