[sagemath] 01/01: Patch spkg's to install to user dir again and disable widgetsnbextension in pruner.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch sage-7.4
in repository sagemath.

commit cd9ae5d5c9764baed363208414a244a857ed5bdf
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Tue Oct 25 13:34:28 2016 +0100

    Patch spkg's to install to user dir again and disable widgetsnbextension in pruner.
---
 debian/patches/debian-temp-userdir.patch | 54 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/pruner/configure.ac               |  4 +++
 debian/pruner/pruner.py.in               |  1 +
 4 files changed, 60 insertions(+)

diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
new file mode 100644
index 0000000..5f4ac45
--- /dev/null
+++ b/debian/patches/debian-temp-userdir.patch
@@ -0,0 +1,54 @@
+Description: Install Sage spkgs to user's home directory
+ This is a temporary measure to get everything working quickly.
+ Eventually we will get rid of this, and add them to the pruner.
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/build/pkgs/sagenb_export/spkg-install
++++ b/sage/build/pkgs/sagenb_export/spkg-install
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+ cd src
+-$PIP_INSTALL .
++python setup.py install --user
+ if [ $? -ne 0 ]; then
+     echo >&2 "Error installing SageNB Export"
+     exit 1
+--- a/sage/build/pkgs/widgetsnbextension/spkg-install
++++ b/sage/build/pkgs/widgetsnbextension/spkg-install
+@@ -4,6 +4,6 @@
+ 
+ cd src
+ 
+-$PIP_INSTALL .
++python setup.py install --user
+ 
+ jupyter nbextension enable --sys-prefix --py widgetsnbextension
+--- a/sage/build/pkgs/ipywidgets/spkg-install
++++ b/sage/build/pkgs/ipywidgets/spkg-install
+@@ -11,4 +11,4 @@
+     fi
+ done
+ 
+-$PIP_INSTALL .
++python setup.py install --user
+--- a/sage/build/pkgs/notebook/spkg-install
++++ b/sage/build/pkgs/notebook/spkg-install
+@@ -13,7 +13,7 @@
+ 
+ set -e
+ 
+-$PIP_INSTALL .
++python setup.py install --user
+ 
+ # Install the Jupyter notebook configuration
+ ETC_JUPYTER="$SAGE_ETC"/jupyter
+--- a/sage/build/pkgs/fpylll/spkg-install
++++ b/sage/build/pkgs/fpylll/spkg-install
+@@ -6,4 +6,4 @@
+     exit 1
+ fi
+ 
+-cd src && python setup.py install
++cd src && python setup.py install --user
diff --git a/debian/patches/series b/debian/patches/series
index b5119bf..ac57112 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # fixes to Sage's code, an inherent problem on their side
 # we should probably forward these upstream
+debian-temp-userdir.patch
 python_security.patch
 silence_debian_bug_780186.patch
 silence_ecl_opt_signals.patch
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index c6cf942..35d8fd9 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -319,6 +319,10 @@ AC_SUBST(HAS_SYMPOW)
 AC_CHECK_PROG(HAS_TACHYON, tachyon, "True", "False")
 AC_SUBST(HAS_TACHYON)
 
+# FIXME(widgetsnbextension): we don't have a package yet, but don't want to install from sage
+HAS_WIDGETSNBEXTENSION="True"
+AC_SUBST(HAS_WIDGETSNBEXTENSION)
+
 # FIXME(zeromq): useful only for pyzmq
 HAS_ZEROMQ="True"
 AC_SUBST(HAS_ZEROMQ)
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 83f7dc7..429d408 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -130,6 +130,7 @@ dico = {
     'symmetrica': @HAS_SYMMETRICA@,
     'sympow': @HAS_SYMPOW@,
     'tachyon': @HAS_TACHYON@,
+    'widgetsnbextension': @HAS_WIDGETSNBEXTENSION@,
     'zeromq': @HAS_ZEROMQ@,
     'zlib': @HAS_ZLIB@,
     'zn_poly': @HAS_ZNPOLY@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git