[gnome-continuous] Use a buildsys patch for dogtail



commit 656586a0bde9263607c962d6d2cb8c190419a159
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Mar 2 11:28:55 2017 +0000

    Use a buildsys patch for dogtail
    
    The build-api implementation inside dogtail tries to generate both
    python2 and python3 modules in very weird ways.
    
    Continuous has standardised on Python3, so let's drop a bunch of
    complexity.

 manifest.json                         |    3 +-
 patches/python-dogtail-buildsys.patch |  103 +++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index bb6af11..114f843 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1119,7 +1119,8 @@
                {"src": "gnome:gnome-shell-extensions",
                 "config-opts": ["--enable-extensions=classic-mode"]},
 
-                {"src": "git:https://gitlab.com/dogtail/dogtail.git"},
+                {"src": "git:https://gitlab.com/dogtail/dogtail.git";,
+                 "patches": ["python-dogtail-buildsys.patch"]},
 
                {"src": "git:git://github.com/r1chardj0n3s/parse.git",
                "patches": ["parse-buildsys.patch"]},
diff --git a/patches/python-dogtail-buildsys.patch b/patches/python-dogtail-buildsys.patch
new file mode 100644
index 0000000..b18c268
--- /dev/null
+++ b/patches/python-dogtail-buildsys.patch
@@ -0,0 +1,103 @@
+From 4b3fd860b2a90b642a3134dc27006893c847c71c Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Thu, 2 Mar 2017 11:27:24 +0000
+Subject: [PATCH] Use Python3 only for dogtail build-api
+
+Simplify the build-api implementation and avoid python2.
+---
+ Makefile  | 71 ++++-----------------------------------------------------------
+ configure |  2 +-
+ 2 files changed, 5 insertions(+), 68 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b313ec5..fd43f94 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,70 +1,7 @@
+ # dogtail *development* Makefile
+ 
+-all: install3 install2
++all:
++      python3 ./setup.py build
+ 
+-install: clean
+-      python setup.py build
+-      python setup.py install --root=$(DESTDIR)
+-
+-
+-install3: clean3
+-      python3 setup.py build
+-      python3 setup.py install --root=$(DESTDIR)
+-
+-install2: clean2
+-      python2 setup.py build
+-      python2 setup.py install --root=$(DESTDIR)
+-
+-clean:
+-      rm -rf api_docs/
+-      rm -f MANIFEST
+-      rm -rf build dist
+-      find . -name '*.pyc' -exec rm {} \;
+-
+-clean2: clean
+-      python2 setup.py clean
+-
+-clean3: clean
+-      python3 setup.py clean
+-
+-check:
+-      pep8 --max-line-length=120 dogtail/*.py tests/*.py scripts/* sniff/sniff
+-
+-test:
+-      nosetests tests/
+-
+-test2:
+-      nosetests2 tests/
+-
+-test3:
+-      nosetests3 tests/
+-
+-tarball:
+-      python setup.py sdist
+-
+-rpm: tarball
+-      # Build using the custom rpmrc in the rpms/ sub-dir
+-      rpmbuild -tb dist/dogtail-*.tar.gz
+-      # Move the source and binary RPMs to dist/
+-      mv ~/rpmbuild/RPMS/noarch/* dist/
+-
+-srpm: rpm_prep
+-      # Build using the custom rpmrc in the rpms/ sub-dir
+-      rpmbuild --rcfile /usr/lib/rpm/rpmrc:/usr/lib/rpm/redhat/rpmrc:`pwd`/rpms/tmp.rpmrc  -ts 
dist/dogtail-*.tar.gz
+-      # Move the source and binary RPMs to dist/
+-      mv rpms/SRPMS/* dist/
+-      rm -rf rpms/
+-
+-apidocs: apidocs_html apidocs_pdf
+-
+-apidocs_html:
+-      epydoc --html --config epydoc.conf
+-
+-apidocs_pdf:
+-      epydoc --pdf --config epydoc.conf
+-      mv api_docs/api.pdf api_docs/dogtail.pdf
+-
+-update_apidocs: apidocs
+-      # Sadly, I'm still the only one who can update the API docs.
+-      ssh zmc fedorapeople org rm -rf \~/public_html/dogtail/epydoc/*
+-      scp api_docs/*.{html,css,png,pdf} zmc fedorapeople org:~/public_html/dogtail/epydoc/
++install:
++      python3 ./setup.py install --root=$(DESTDIR) --prefix=/usr
+diff --git a/configure b/configure
+index fb4adf9..e7ce620 100755
+--- a/configure
++++ b/configure
+@@ -2,4 +2,4 @@
+ # http://people.gnome.org/~walters/docs/build-api.txt
+ # We don't support separate builddir when building from git
+ #buildapi-variable-no-builddir
+-exec python3 setup.py build
++exec python3 ./setup.py build
+-- 
+2.9.3
+


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