scidavis/scidavis-python2.patch

   1 # HG changeset patch
   2 # User Robal <nigrantis.tigris@gmail.com>
   3 # Date 1287746261 -7200
   4 # Node ID 1f5799d979b49f7bdd5ebb58e9c2083081147529
   5 # Parent  5765007ad9e767615a57ead333906b19cfa43c54
   6 set python2 env
   7
   8 diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-includepath.py
   9 --- a/scidavis/python-includepath.py    Fri Oct 22 13:09:25 2010 +0200
  10 +++ b/scidavis/python-includepath.py    Fri Oct 22 13:17:41 2010 +0200
  11 @@ -1,4 +1,4 @@
  12 -#!/usr/bin/python
  13 +#!/usr/bin/python2
  14  from distutils import sysconfig
  15  from PyQt4 import pyqtconfig
  16  config = pyqtconfig.Configuration()
  17 diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-libs-win.py
  18 --- a/scidavis/python-libs-win.py       Fri Oct 22 13:09:25 2010 +0200
  19 +++ b/scidavis/python-libs-win.py       Fri Oct 22 13:17:41 2010 +0200
  20 @@ -1,4 +1,4 @@
  21 -#!/usr/bin/python
  22 +#!/usr/bin/python2
  23  from PyQt4 import pyqtconfig
  24  config = pyqtconfig.Configuration()
  25
  26 diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-sipcmd.py
  27 --- a/scidavis/python-sipcmd.py Fri Oct 22 13:09:25 2010 +0200
  28 +++ b/scidavis/python-sipcmd.py Fri Oct 22 13:17:41 2010 +0200
  29 @@ -1,4 +1,4 @@
  30 -#!/usr/bin/python
  31 +#!/usr/bin/python2
  32  from PyQt4 import pyqtconfig
  33  config = pyqtconfig.Configuration()
  34  flags = []
  35 diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python.pri
  36 --- a/scidavis/python.pri       Fri Oct 22 13:09:25 2010 +0200
  37 +++ b/scidavis/python.pri       Fri Oct 22 13:17:41 2010 +0200
  38 @@ -15,7 +15,7 @@
  39    SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
  40
  41    unix {
  42 -    INCLUDEPATH += $$system(python python-includepath.py)
  43 +    INCLUDEPATH += $$system(python2 python-includepath.py)
  44      macx {
  45        LIBS += -framework Python
  46      } else {
  47 @@ -23,7 +23,7 @@
  48      }
  49      LIBS        += -lm
  50      system(mkdir -p $${SIP_DIR})
  51 -    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
  52 +    system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
  53    }
  54
  55    win32 {
  56 # HG changeset patch
  57 # User Robal <nigrantis.tigris@gmail.com>
  58 # Date 1287751697 -7200
  59 # Node ID 42d95b7369a82382d81670c5d0af3d675262c93f
  60 # Parent  1f5799d979b49f7bdd5ebb58e9c2083081147529
  61 change missed 'python' to 'python2' in python.pri
  62
  63 diff -r 1f5799d979b4 -r 42d95b7369a8 scidavis/python.pri
  64 --- a/scidavis/python.pri       Fri Oct 22 13:17:41 2010 +0200
  65 +++ b/scidavis/python.pri       Fri Oct 22 14:48:17 2010 +0200
  66 @@ -19,7 +19,7 @@
  67      macx {
  68        LIBS += -framework Python
  69      } else {
  70 -      LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
  71 +      LIBS += $$system(python2 -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
  72      }
  73      LIBS        += -lm
  74      system(mkdir -p $${SIP_DIR})