diff options
| author | Evgeniy Alekseev | 2017-06-02 13:50:15 +0300 |
|---|---|---|
| committer | Evgeniy Alekseev | 2017-06-02 13:50:15 +0300 |
| commit | 5b0691cd87d86073f478f2dba86b6dbb25a04506 (patch) | |
| tree | 1df7e5c8963bcfb2cbba95d3a84e3cceb9f38fa1 /scidavis-python2.patch | |
| parent | 9434092efc55bf2ce060e4fefe9674736810fdd6 (diff) | |
| download | aur-5b0691cd87d86073f478f2dba86b6dbb25a04506.tar.gz | |
bump scidavis
Diffstat (limited to 'scidavis-python2.patch')
| -rw-r--r-- | scidavis-python2.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/scidavis-python2.patch b/scidavis-python2.patch new file mode 100644 index 000000000000..87dc0e908419 --- /dev/null +++ b/scidavis-python2.patch @@ -0,0 +1,62 @@ +diff -ruN scidavis-1.17-orig/libscidavis/python.pri scidavis-1.17/libscidavis/python.pri +--- scidavis-1.17-orig/libscidavis/python.pri 2017-06-02 13:38:52.806445430 +0300 ++++ scidavis-1.17/libscidavis/python.pri 2017-06-02 13:39:55.710957205 +0300 +@@ -16,18 +16,18 @@ + SOURCES += src/PythonScript.cpp src/PythonScripting.cpp + + unix { +- INCLUDEPATH += $$system(python-config --includes|sed -e 's/-I//') ++ INCLUDEPATH += $$system(python2-config --includes|sed -e 's/-I//') + osx_dist { + DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources +- } ++ } + system(mkdir -p $${SIP_DIR}) +- system($$system(python python-sipcmd.py) $$system(python-config --includes) -c $${SIP_DIR} src/scidavis.sip) ++ system($$system(python2 python-sipcmd.py) $$system(python2-config --includes) -c $${SIP_DIR} src/scidavis.sip) + } + + win32 { + mxe { + DEFINES += SIP_STATIC_MODULE +- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip) ++ system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip) + } else { + INCLUDEPATH += $$system(call ../python-includepath.py) + # TODO: fix the command below (only really necessary if SIP_DIR != MOC/OBJECTS_DIR) +diff -ruN scidavis-1.17-orig/scidavis/python.pri scidavis-1.17/scidavis/python.pri +--- scidavis-1.17-orig/scidavis/python.pri 2017-06-02 13:46:20.953100711 +0300 ++++ scidavis-1.17/scidavis/python.pri 2017-06-02 13:47:05.315306277 +0300 +@@ -9,10 +9,10 @@ + + compiledScidavisrc.target = scidavisrc.pyc + compiledScidavisrc.depends = scidavisrc.py +- compiledScidavisrc.commands = python -m py_compile scidavisrc.py ++ compiledScidavisrc.commands = python2 -m py_compile scidavisrc.py + compiledScidavisUtil.target = scidavisUtil.pyc + compiledScidavisUtil.depends = scidavisUtil.py +- compiledScidavisUtil.commands = python -m py_compile scidavisUtil.py ++ compiledScidavisUtil.commands = python2 -m py_compile scidavisUtil.py + QMAKE_EXTRA_TARGETS += compiledScidavisrc compiledScidavisUtil + PRE_TARGETDEPS += scidavisrc.pyc scidavisUtil.pyc + +@@ -24,16 +24,16 @@ + + message("Making PyQt bindings via SIP") + unix { +- INCLUDEPATH += $$system(python-config --includes|sed -e 's/-I//') ++ INCLUDEPATH += $$system(python2-config --includes|sed -e 's/-I//') + osx_dist { + DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources + } else { + macx { + LIBS += -framework Python + } else { +- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") ++ LIBS += $$system(python2 -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") + } +- } ++ } + LIBS += -lm + } + |