diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD index faafd18..593e455 100644 --- a/scidavis/PKGBUILD +++ b/scidavis/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Robal pkgname=scidavis -pkgver=1.D4 -pkgrel=3 +pkgver=1.D5 +pkgrel=1 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot" arch=('i686' 'x86_64') url="http://scidavis.sourceforge.net/" @@ -17,10 +17,10 @@ source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}.${pkg scidavis-qtassistant.patch scidavis-qwt5.patch) install=${pkgname}.install -md5sums=('a429ad206e44b23ad2dd4b8a94d63876' - 'a0cdc1b257a158a848e37c91122bd5f7' - 'f891b7a14b5b3f1dbf9a0df2a4e8ea1d' - 'd622f925d7677556cba55f98f3735aa9') +md5sums=('2bc5cde484544bd3f570e8cd6125812b' + '467cb6e8f6577ad54ea8b4371bc09118' + 'c4e257140ed772c08be2a151ae725634' + '8d3f9b4cafd886ca4835178c44b03db5') prepare() { cd "${srcdir}" diff --git a/scidavis/scidavis-python2.patch b/scidavis/scidavis-python2.patch index 58c761f..ed72a40 100644 --- a/scidavis/scidavis-python2.patch +++ b/scidavis/scidavis-python2.patch @@ -1,33 +1,33 @@ -diff -ruN scidavis.1.D4.orig/scidavis/python-includepath.py scidavis.1.D4/scidavis/python-includepath.py ---- scidavis.1.D4.orig/scidavis/python-includepath.py 2013-12-27 21:04:33.000000000 +0400 -+++ scidavis.1.D4/scidavis/python-includepath.py 2014-01-20 21:48:05.381379147 +0400 +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.D4.orig/scidavis/python-libs-win.py scidavis.1.D4/scidavis/python-libs-win.py ---- scidavis.1.D4.orig/scidavis/python-libs-win.py 2013-12-27 21:04:33.000000000 +0400 -+++ scidavis.1.D4/scidavis/python-libs-win.py 2014-01-20 21:48:12.501378852 +0400 +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.D4.orig/scidavis/python-sipcmd.py scidavis.1.D4/scidavis/python-sipcmd.py ---- scidavis.1.D4.orig/scidavis/python-sipcmd.py 2013-12-27 21:04:33.000000000 +0400 -+++ scidavis.1.D4/scidavis/python-sipcmd.py 2014-01-20 21:48:18.078045287 +0400 +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.D4.orig/scidavis/python.pri scidavis.1.D4/scidavis/python.pri ---- scidavis.1.D4.orig/scidavis/python.pri 2013-12-27 21:04:33.000000000 +0400 -+++ scidavis.1.D4/scidavis/python.pri 2014-01-20 21:49:07.758043225 +0400 +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 diff --git a/scidavis/scidavis-qtassistant.patch b/scidavis/scidavis-qtassistant.patch index a9f9c15..52e92f0 100644 --- a/scidavis/scidavis-qtassistant.patch +++ b/scidavis/scidavis-qtassistant.patch @@ -1,6 +1,6 @@ -diff -ruN scidavis.1.D4.orig/scidavis/src/ApplicationWindow.cpp scidavis.1.D4/scidavis/src/ApplicationWindow.cpp ---- scidavis.1.D4.orig/scidavis/src/ApplicationWindow.cpp 2013-12-27 21:04:33.000000000 +0400 -+++ scidavis.1.D4/scidavis/src/ApplicationWindow.cpp 2014-01-20 21:55:16.441361255 +0400 +diff -ruN scidavis.1.D5.orig/scidavis/src/ApplicationWindow.cpp scidavis.1.D5/scidavis/src/ApplicationWindow.cpp +--- scidavis.1.D5.orig/scidavis/src/ApplicationWindow.cpp 2013-12-27 21:04:33.000000000 +0400 ++++ scidavis.1.D5/scidavis/src/ApplicationWindow.cpp 2014-01-20 21:55:16.441361255 +0400 @@ -142,7 +142,7 @@ #include #include diff --git a/scidavis/scidavis-qwt5.patch b/scidavis/scidavis-qwt5.patch index 6e00638..d22b332 100644 --- a/scidavis/scidavis-qwt5.patch +++ b/scidavis/scidavis-qwt5.patch @@ -1,6 +1,6 @@ -diff -ruN scidavis.1.D4.orig/scidavis/scidavis.pro scidavis.1.D4/scidavis/scidavis.pro ---- scidavis.1.D4.orig/scidavis/scidavis.pro 2014-01-25 12:53:35.000000000 +0400 -+++ scidavis.1.D4/scidavis/scidavis.pro 2014-02-02 03:59:38.081706638 +0400 +diff -ruN scidavis.1.D5.orig/scidavis/scidavis.pro scidavis.1.D5/scidavis/scidavis.pro +--- scidavis.1.D5.orig/scidavis/scidavis.pro 2014-01-25 12:53:35.000000000 +0400 ++++ scidavis.1.D5/scidavis/scidavis.pro 2014-02-02 03:59:38.081706638 +0400 @@ -230,7 +230,7 @@ } else { INCLUDEPATH += /usr/include/qwt$${qwtsuff}