arcanis/pkgbuild
1
0
Fork 0
mirror of https://github.com/arcan1s/pkgbuild.git synced 2025-04-24 23:47:17 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scidavis/PKGBUILD
View File

@ -1,31 +1,35 @@
# Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com> # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
# Contributor: Knut Franke <Knut.Franke ad gmx dot de> # Contributor: Knut Franke <Knut.Franke ad gmx dot de>
# Contributor: Olaf Leidinger <leidola at newcon dot de> # Contributor: Olaf Leidinger <leidola at newcon dot de>
# Contributor: Robal <nigrantis.tigris at gmail dot com> # Contributor: Robal <nigrantis.tigris at gmail dot com>
pkgname=scidavis pkgname=scidavis
pkgver=1.D5 pkgver=1.D8
pkgrel=1 pkgrel=1
pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot" pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://scidavis.sourceforge.net/" url="http://scidavis.sourceforge.net/"
license=('GPL') license=('GPL')
depends=('gsl' 'glu' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info' depends=('gsl' 'glu' 'liborigin2' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
'qt-assistant-compat' 'qwt5' 'qwtplot3d') 'qt-assistant-compat' 'qwt5' 'qwtplot3d')
source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}.${pkgver}.tar.gz source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}.${pkgver}.tar.gz
scidavis-python2.patch scidavis-origin.patch
scidavis-python.patch
scidavis-qtassistant.patch scidavis-qtassistant.patch
scidavis-qwt5.patch) scidavis-qwt5.patch)
install=${pkgname}.install install=${pkgname}.install
md5sums=('2bc5cde484544bd3f570e8cd6125812b' md5sums=('c421b6a38f5183780bdf6c5960d92df5'
'467cb6e8f6577ad54ea8b4371bc09118' 'SKIP'
'c4e257140ed772c08be2a151ae725634' '8ee84407966fed8eb12efeee42c5ef9c'
'8d3f9b4cafd886ca4835178c44b03db5') 'b35c4fcbc22ca981a1679ae571ab3bed'
'749297643799f48527178bdb43ad94e7')
prepare() { prepare() {
cd "${srcdir}" cd "${srcdir}"
# fix python # use system liborigin
patch -p0 -i "${srcdir}/scidavis-python2.patch" patch -p0 -i "${srcdir}/scidavis-origin.patch"
# python patch
patch -p0 -i "${srcdir}/scidavis-python.patch"
# fix qtassistant # fix qtassistant
patch -p0 -i "${srcdir}/scidavis-qtassistant.patch" patch -p0 -i "${srcdir}/scidavis-qtassistant.patch"
# fix qwt # fix qwt
@ -40,10 +44,9 @@ build() {
package() { package() {
cd "${srcdir}/${pkgname}.${pkgver}" cd "${srcdir}/${pkgname}.${pkgver}"
make INSTALL_ROOT="${pkgdir}" install make INSTALL_ROOT="${pkgdir}" DESTDIR="${pkgdir}" install
_pydir=$(python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()") _pydir=$(python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/etc/scidavisrc.py" python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/etc/scidavisrc.py"
python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/usr/share/scidavis/scidavisUtil.py" python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/usr/share/scidavis/scidavisUtil.py"
} }

33
scidavis/scidavis-origin.patch Normal file
View File

@ -0,0 +1,33 @@
diff -ruN scidavis.1.D8.orig/config.pri scidavis.1.D8/config.pri
--- scidavis.1.D8.orig/config.pri 2014-07-23 12:39:15.000000000 +0400
+++ scidavis.1.D8/config.pri 2014-07-23 13:37:24.654969180 +0400
@@ -198,7 +198,7 @@
# code for maintained branch of liborigin.
contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += ../3rdparty/liborigin/liborigin.a
+# LIBS += ../3rdparty/liborigin/liborigin.a
INCLUDEPATH += ../3rdparty/liborigin
}
@@ -274,6 +274,8 @@
# LIBS += -L../3rdparty/liborigin -lorigin
# INCLUDEPATH += ../3rdparty/liborigin
# }
+ INCLUDEPATH += /usr/include/liborigin2
+ LIBS += -lorigin2
}
contains(PRESET, self_contained) {
diff -ruN scidavis.1.D8.orig/scidavis.pro scidavis.1.D8/scidavis.pro
--- scidavis.1.D8.orig/scidavis.pro 2014-07-23 09:01:09.000000000 +0400
+++ scidavis.1.D8/scidavis.pro 2014-07-23 13:37:01.634969788 +0400
@@ -7,7 +7,7 @@
#################################################
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/liborigin scidavis test
+SUBDIRS = scidavis test
CONFIG+=ordered
# Overwrite the qmake generated Makefile by the cmake one

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)

49
scidavis/scidavis-python2.patch
View File

@ -1,49 +0,0 @@
diff -ruN scidavis.1.D5.orig/scidavis/python-includepath.py scidavis.1.D5/scidavis/python-includepath.py
--- scidavis.1.D5.orig/scidavis/python-includepath.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D5/scidavis/python-includepath.py 2014-01-20 21:48:05.381379147 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D5.orig/scidavis/python-libs-win.py scidavis.1.D5/scidavis/python-libs-win.py
--- scidavis.1.D5.orig/scidavis/python-libs-win.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D5/scidavis/python-libs-win.py 2014-01-20 21:48:12.501378852 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D5.orig/scidavis/python-sipcmd.py scidavis.1.D5/scidavis/python-sipcmd.py
--- scidavis.1.D5.orig/scidavis/python-sipcmd.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D5/scidavis/python-sipcmd.py 2014-01-20 21:48:18.078045287 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D5.orig/scidavis/python.pri scidavis.1.D5/scidavis/python.pri
--- scidavis.1.D5.orig/scidavis/python.pri 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D5/scidavis/python.pri 2014-01-20 21:49:07.758043225 +0400
@@ -15,15 +15,15 @@
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
unix {
- INCLUDEPATH += $$system(python python-includepath.py)
+ INCLUDEPATH += $$system(python2 python-includepath.py)
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} src/scidavis.sip)
+ system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
}
win32 {

12
scidavis/scidavis-qtassistant.patch
View File

@ -1,12 +1,12 @@
diff -ruN scidavis.1.D5.orig/scidavis/src/ApplicationWindow.cpp scidavis.1.D5/scidavis/src/ApplicationWindow.cpp diff -ruN scidavis.1.D8.orig/scidavis/src/ApplicationWindow.cpp scidavis.1.D8/scidavis/src/ApplicationWindow.cpp
--- scidavis.1.D5.orig/scidavis/src/ApplicationWindow.cpp 2013-12-27 21:04:33.000000000 +0400 --- scidavis.1.D8.orig/scidavis/src/ApplicationWindow.cpp 2014-07-22 12:01:44.000000000 +0400
+++ scidavis.1.D5/scidavis/src/ApplicationWindow.cpp 2014-01-20 21:55:16.441361255 +0400 +++ scidavis.1.D8/scidavis/src/ApplicationWindow.cpp 2014-07-23 09:18:28.882046613 +0400
@@ -142,7 +142,7 @@ @@ -143,7 +143,7 @@
#include <QVarLengthArray>
#include <QList> #include <QList>
#include <QUrl> #include <QUrl>
#ifndef NOASSISTANT
-#include <QtAssistant/QAssistantClient> -#include <QtAssistant/QAssistantClient>
+#include <QtAssistant/qassistantclient.h> +#include <QtAssistant/qassistantclient.h>
#endif
#include <QStatusBar> #include <QStatusBar>
#include <QToolButton> #include <QToolButton>
#include <QSignalMapper>

8
scidavis/scidavis-qwt5.patch
View File

@ -1,7 +1,7 @@
diff -ruN scidavis.1.D5.orig/scidavis/scidavis.pro scidavis.1.D5/scidavis/scidavis.pro diff -ruN scidavis.1.D8.orig/config.pri scidavis.1.D8/config.pri
--- scidavis.1.D5.orig/scidavis/scidavis.pro 2014-01-25 12:53:35.000000000 +0400 --- scidavis.1.D8.orig/config.pri 2014-07-22 12:01:44.000000000 +0400
+++ scidavis.1.D5/scidavis/scidavis.pro 2014-02-02 03:59:38.081706638 +0400 +++ scidavis.1.D8/config.pri 2014-07-23 10:29:36.111933787 +0400
@@ -230,7 +230,7 @@ @@ -261,7 +261,7 @@
} else { } else {
INCLUDEPATH += /usr/include/qwt$${qwtsuff} INCLUDEPATH += /usr/include/qwt$${qwtsuff}
} }

1
scidavis/scidavis.install
View File

@ -1,4 +1,5 @@
post_install() { post_install() {
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
update-desktop-database -q update-desktop-database -q
update-mime-database /usr/share/mime/ > /dev/null update-mime-database /usr/share/mime/ > /dev/null
} }