upgrade to 1.23

3 files changed, 9 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb549282e57b..97eef284adb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Nov 30 15:45:52 UTC 2017
 pkgbase = scidavis
 	pkgdesc = Application for Scientific Data Analysis and Visualization, fork of QtiPlot
-	pkgver = 1.22
+	pkgver = 1.23
 	pkgrel = 1
 	url = http://scidavis.sourceforge.net/
 	arch = i686
@@ -14,14 +12,12 @@ pkgbase = scidavis
 	depends = glu
 	depends = mesa
 	depends = muparser
-	depends = python2-pyqt4
+	depends = python-pyqt4
 	depends = shared-mime-info
 	depends = qwt5
 	depends = qwtplot3d
-	source = https://prdownloads.sourceforge.net/sourceforge/scidavis/scidavis-1.22.tar.gz
-	source = scidavis-python2.patch
-	sha512sums = 07d94b2f8a05f28d2d461ee6109397a648bfcdcd479fca886771ad04ef8e21bfb1703891077c67a0a4a4dca5b1c31bc7029e33ebd982425a41efce42fa3319b6
-	sha512sums = 3382e664df6e4f6ffc78ad974e3d27afbb6ffb091bd1b397e627cd4d0381e9c20c4c4a18f920ecb2a24e807765dd770d446197c93dc2d365acb0c722c4d0c63a
+	source = https://prdownloads.sourceforge.net/sourceforge/scidavis/scidavis-1.23.tar.gz
+	sha512sums = b221ce0892e4291d8efd944b3f5632f20863c311189f6eadee878d902b7e0a784ef429362c52f353f78f8c523792e10b4db5d9d14a379b2a6b13219bb25a6e09
 
 pkgname = scidavis
 
diff --git a/PKGBUILD b/PKGBUILD
index d9f0bf14e184..29fa1a98e694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,22 @@
 # Contributor: Alexander <chronischzuspaet at gmail dot com> Kempen
 
 pkgname=scidavis
-pkgver=1.22
+pkgver=1.23
 pkgrel=1
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot"
 arch=('i686' 'x86_64')
 url="http://scidavis.sourceforge.net/"
 license=('GPL')
 makedepends=('boost' 'cmake')
-depends=('gsl' 'glu' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
+depends=('gsl' 'glu' 'mesa' 'muparser' 'python-pyqt4' 'shared-mime-info'
          'qwt5' 'qwtplot3d')
-source=("https://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.gz"
-        "scidavis-python2.patch")
-sha512sums=('07d94b2f8a05f28d2d461ee6109397a648bfcdcd479fca886771ad04ef8e21bfb1703891077c67a0a4a4dca5b1c31bc7029e33ebd982425a41efce42fa3319b6'
-            '3382e664df6e4f6ffc78ad974e3d27afbb6ffb091bd1b397e627cd4d0381e9c20c4c4a18f920ecb2a24e807765dd770d446197c93dc2d365acb0c722c4d0c63a')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-
-  # replace to python2
-  find . -name '*.py' -type f -exec \
-      sed -i 's|/usr/bin/python|/usr/bin/python2|' {} \;
-  patch -p1 -i "../scidavis-python2.patch"
-}
+source=("https://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('b221ce0892e4291d8efd944b3f5632f20863c311189f6eadee878d902b7e0a784ef429362c52f353f78f8c523792e10b4db5d9d14a379b2a6b13219bb25a6e09')
 
 build() {
   cd "${pkgname}-${pkgver}"
   qmake-qt4 CONFIG+="liborigin python"
+  make qmake
   make
 }
 
diff --git a/scidavis-python2.patch b/scidavis-python2.patch
deleted file mode 100644
index 87dc0e908419..000000000000
--- a/scidavis-python2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
-   }
-