arcanis/pkgbuild
1
0
Fork 0
mirror of https://github.com/arcan1s/pkgbuild.git synced 2025-07-12 21:25:46 +00:00
Code Issues Projects Releases Wiki Activity

scidavis

Browse Source
This commit is contained in:
arcan1s
2014-07-23 13:45:01 +04:00
parent 177db0a1f1
commit 43a08af600
7 changed files with 127 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
scidavis/scidavis-python.patch Normal file
View File

@ -0,0 +1,68 @@
diff -ruN scidavis.1.D8.orig/scidavis/python-includepath.py scidavis.1.D8/scidavis/python-includepath.py
--- scidavis.1.D8.orig/scidavis/python-includepath.py 2014-07-22 12:01:44.000000000 +0400
+++ scidavis.1.D8/scidavis/python-includepath.py 2014-07-23 11:29:57.651838033 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
@@ -28,6 +28,4 @@
############################################################################
from distutils import sysconfig
-from PyQt4 import pyqtconfig
-config = pyqtconfig.Configuration()
-print " ".join([sysconfig.get_python_inc(), config.sip_inc_dir])
+print sysconfig.get_python_inc()
diff -ruN scidavis.1.D8.orig/scidavis/python-sipcmd.py scidavis.1.D8/scidavis/python-sipcmd.py
--- scidavis.1.D8.orig/scidavis/python-sipcmd.py 2014-07-22 12:01:44.000000000 +0400
+++ scidavis.1.D8/scidavis/python-sipcmd.py 2014-07-23 11:39:18.501823204 +0400
@@ -27,10 +27,6 @@
# #
############################################################################
-from PyQt4 import pyqtconfig
-config = pyqtconfig.Configuration()
flags = ["-I ../scidavis"]
-if config.sip_version >= 0x040a00:
- # make use of docstring generation feature in SIP >= 4.10
- flags.append("-o")
-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags] + flags)
+flags.append("-o")
+print " ".join(["/usr/bin/sip", "-I", "/usr/share/sip", "-x VendorID -t WS_X11 -t Qt_4_8_6 -x Py_v3"] + flags)
diff -ruN scidavis.1.D8.orig/scidavis/python.pri scidavis.1.D8/scidavis/python.pri
--- scidavis.1.D8.orig/scidavis/python.pri 2014-07-22 12:01:44.000000000 +0400
+++ scidavis.1.D8/scidavis/python.pri 2014-07-23 11:23:28.455181657 +0400
@@ -16,19 +16,19 @@
SOURCES += ../scidavis/src/PythonScript.cpp ../scidavis/src/PythonScripting.cpp
unix {
- INCLUDEPATH += $$system(python python-includepath.py)
+ INCLUDEPATH += $$system(python2 python-includepath.py)
contains(PRESET,mac_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
system(mkdir -p $${SIP_DIR})
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} ../scidavis/src/scidavis.sip)
+ system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} ../scidavis/src/scidavis.sip)
}
win32 {
@@ -36,7 +36,7 @@
DEFINES += SIP_STATIC_MODULE
# QMAKE_LIBPATH += "$$(HOME)/usr/mxe/PyQt4/"
LIBS += -L"$$(HOME)/usr/mxe/PyQt4/" -lPyQtCore -lPyQtGui -lqpygui -lqpycore -lsip -lpython27
- 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)
LIBS += $$system(call python-libs-win.py)