update to 3.0.2-1

3 files changed, 106 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc2c70ca5eb7..0caaefa7abf0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opensesame
 	pkgdesc = A graphical, open-source experiment builder for the social sciences, with ability to deploy on Android
-	pkgver = 2.9.7
+	pkgver = 3.0.2
 	pkgrel = 1
 	url = http://www.cogsci.nl/software/opensesame
 	arch = any
@@ -8,22 +8,24 @@ pkgbase = opensesame
 	makedepends = git
 	depends = python2
 	depends = python2-pygame
-	depends = python2-numpy
 	depends = python2-pyqt4
 	depends = python2-qscintilla
-	depends = python2-qprogedit>=2.0.0
-	depends = python2-imaging
-	depends = python2-markdown
-	depends = faenza-icon-theme
+	depends = python2-qprogedit>=3.0.0
 	depends = python2-yaml
+	depends = python2-webcolors
+	depends = python2-numpy
+	depends = python2-pillow
+	depends = python2-markdown
 	optdepends = psychopy: PsychoPy backend
 	optdepends = python2-expyriment: Expyriment backend
 	optdepends = python2-pyserial: Serial/Parallel port communication
+	optdepends = python2-pyflakes: validation of python scripts
+	optdepends = ipython2: improved debugging
 	options = !emptydirs
-	source = opensesame-2.9.7::git://github.com/smathot/OpenSesame.git#tag=release/2.9.7
+	source = opensesame-3.0.2::git://github.com/smathot/OpenSesame.git#tag=release/3.0.2
 	source = python2.patch
 	md5sums = SKIP
-	md5sums = b7238618028cffb2169c5b05a332e144
+	md5sums = 3620ccb77431d68a968a6d17ed9c5568
 
 pkgname = opensesame
 
diff --git a/PKGBUILD b/PKGBUILD
index d51103671014..3db0a63c3a62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Martin Corley <Martin.Corley@ed.ac.uk>
 
 pkgname=opensesame
-pkgver=2.9.7
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A graphical, open-source experiment builder for the social sciences, with ability to deploy on Android"
 arch=(any)
@@ -9,20 +9,26 @@ url="http://www.cogsci.nl/software/opensesame"
 license=(GPL)
 makedepends='git'
 # This is a fairly minimal set of dependencies
-depends=('python2' 'python2-pygame' 'python2-numpy' 'python2-pyqt4'
-'python2-qscintilla' 'python2-qprogedit>=2.0.0' 'python2-imaging'
-'python2-markdown' 'faenza-icon-theme' 'python2-yaml')
+depends=('python2' 'python2-pygame' 'python2-pyqt4'
+'python2-qscintilla' 'python2-qprogedit>=3.0.0' 'python2-yaml'
+'python2-webcolors'
+'python2-numpy' 'python2-pillow' 'python2-markdown')
+
+#'faenza-icon-theme'
+
 optdepends=('psychopy: PsychoPy backend'
 'python2-expyriment: Expyriment backend'
-'python2-pyserial: Serial/Parallel port communication')
+'python2-pyserial: Serial/Parallel port communication'
+'python2-pyflakes: validation of python scripts'
+'ipython2: improved debugging')
 
 options=(!emptydirs)
 #source=(http://files.cogsci.nl/software/opensesame/opensesame_${pkgver}-1.tar.g
 #python2.patch)
-source=("$pkgname-$pkgver"::'git://github.com/smathot/OpenSesame.git#tag=release/2.9.7'
+source=("$pkgname-$pkgver"::'git://github.com/smathot/OpenSesame.git#tag=release/3.0.2'
 python2.patch)
 md5sums=('SKIP'
-         'b7238618028cffb2169c5b05a332e144')
+         '3620ccb77431d68a968a6d17ed9c5568')
 
 fix_links() {
   cd  "$pkgdir/usr/share/opensesame/resources/theme/gnome/os-custom-icons/"
diff --git a/python2.patch b/python2.patch
index 97eafe117a0c..1547e7719efe 100644
--- a/python2.patch
+++ b/python2.patch
@@ -1,6 +1,6 @@
-diff -aur opensesame-2.9.1.orig/dev-scripts/architecture.py opensesame-2.9.1/dev-scripts/architecture.py
---- opensesame-2.9.1.orig/dev-scripts/architecture.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/architecture.py	2014-11-18 10:01:47.026057991 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/architecture.py opensesame-3.0.2/dev-scripts/architecture.py
+--- opensesame-3.0.2.orig/dev-scripts/architecture.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/architecture.py	2015-11-17 22:26:02.278515110 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
@@ -16,153 +16,182 @@ diff -aur opensesame-2.9.1.orig/dev-scripts/architecture.py opensesame-2.9.1/dev
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/dev-scripts/check_ts.py opensesame-2.9.1/dev-scripts/check_ts.py
---- opensesame-2.9.1.orig/dev-scripts/check_ts.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/check_ts.py	2014-11-18 10:01:47.029391307 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/check_ts.py opensesame-3.0.2/dev-scripts/check_ts.py
+--- opensesame-3.0.2.orig/dev-scripts/check_ts.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/check_ts.py	2015-11-17 22:26:02.278515110 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/dev-scripts/docstruct.py opensesame-2.9.1/dev-scripts/docstruct.py
---- opensesame-2.9.1.orig/dev-scripts/docstruct.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/docstruct.py	2014-11-18 10:01:47.039391256 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/docstruct.py opensesame-3.0.2/dev-scripts/docstruct.py
+--- opensesame-3.0.2.orig/dev-scripts/docstruct.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/docstruct.py	2015-11-17 22:26:02.285181681 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/dev-scripts/extract_translatables.py opensesame-2.9.1/dev-scripts/extract_translatables.py
---- opensesame-2.9.1.orig/dev-scripts/extract_translatables.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/extract_translatables.py	2014-11-18 10:01:47.039391256 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/extract_translatables.py opensesame-3.0.2/dev-scripts/extract_translatables.py
+--- opensesame-3.0.2.orig/dev-scripts/extract_translatables.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/extract_translatables.py	2015-11-17 22:26:02.288514966 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/dev-scripts/item-help.py opensesame-2.9.1/dev-scripts/item-help.py
---- opensesame-2.9.1.orig/dev-scripts/item-help.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/item-help.py	2014-11-18 10:01:47.042724572 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/item-help.py opensesame-3.0.2/dev-scripts/item-help.py
+--- opensesame-3.0.2.orig/dev-scripts/item-help.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/item-help.py	2015-11-17 22:26:02.291848253 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/dev-scripts/update-hidden.py opensesame-2.9.1/dev-scripts/update-hidden.py
---- opensesame-2.9.1.orig/dev-scripts/update-hidden.py	2014-11-18 09:59:01.040205947 +0000
-+++ opensesame-2.9.1/dev-scripts/update-hidden.py	2014-11-18 10:01:47.042724572 +0000
+diff -aur opensesame-3.0.2.orig/dev-scripts/update-hidden.py opensesame-3.0.2/dev-scripts/update-hidden.py
+--- opensesame-3.0.2.orig/dev-scripts/update-hidden.py	2015-11-17 22:24:48.416242619 +0000
++++ opensesame-3.0.2/dev-scripts/update-hidden.py	2015-11-17 22:26:02.295181538 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesame opensesame-2.9.1/opensesame
---- opensesame-2.9.1.orig/opensesame	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesame	2014-11-18 10:01:47.649388124 +0000
+Only in opensesame-3.0.2/.git/objects/pack: pack-accdeab19262a93dd8ffbdfd0c24b93997424e99.idx.bak
+Only in opensesame-3.0.2/.git/objects/pack: pack-accdeab19262a93dd8ffbdfd0c24b93997424e99.pack.bak
+diff -aur opensesame-3.0.2.orig/opensesame opensesame-3.0.2/opensesame
+--- opensesame-3.0.2.orig/opensesame	2015-11-17 22:24:48.442908900 +0000
++++ opensesame-3.0.2/opensesame	2015-11-17 22:26:03.221834971 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesameandroid.py opensesame-2.9.1/opensesameandroid.py
---- opensesame-2.9.1.orig/opensesameandroid.py	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesameandroid.py	2014-11-18 10:01:47.662721389 +0000
+diff -aur opensesame-3.0.2.orig/opensesameandroid.py opensesame-3.0.2/opensesameandroid.py
+--- opensesame-3.0.2.orig/opensesameandroid.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesameandroid.py	2015-11-17 22:26:03.245167971 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesamerun opensesame-2.9.1/opensesamerun
---- opensesame-2.9.1.orig/opensesamerun	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesamerun	2014-11-18 10:01:47.662721389 +0000
+diff -aur opensesame-3.0.2.orig/opensesamerun opensesame-3.0.2/opensesamerun
+--- opensesame-3.0.2.orig/opensesamerun	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesamerun	2015-11-17 22:26:03.245167971 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesame_unittest/backends.py opensesame-2.9.1/opensesame_unittest/backends.py
---- opensesame-2.9.1.orig/opensesame_unittest/backends.py	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesame_unittest/backends.py	2014-11-18 10:01:47.656054757 +0000
+diff -aur opensesame-3.0.2.orig/opensesame_unittest/backends.py opensesame-3.0.2/opensesame_unittest/backends.py
+--- opensesame-3.0.2.orig/opensesame_unittest/backends.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesame_unittest/backends.py	2015-11-17 22:26:03.228501543 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesame_unittest/parsing.py opensesame-2.9.1/opensesame_unittest/parsing.py
---- opensesame-2.9.1.orig/opensesame_unittest/parsing.py	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesame_unittest/parsing.py	2014-11-18 10:01:47.656054757 +0000
+diff -aur opensesame-3.0.2.orig/opensesame_unittest/color.py opensesame-3.0.2/opensesame_unittest/color.py
+--- opensesame-3.0.2.orig/opensesame_unittest/color.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesame_unittest/color.py	2015-11-17 22:26:03.231834828 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/opensesame_unittest/syntax.py opensesame-2.9.1/opensesame_unittest/syntax.py
---- opensesame-2.9.1.orig/opensesame_unittest/syntax.py	2014-11-18 09:59:01.126871838 +0000
-+++ opensesame-2.9.1/opensesame_unittest/syntax.py	2014-11-18 10:01:47.659388072 +0000
+diff -aur opensesame-3.0.2.orig/opensesame_unittest/compilable.py opensesame-3.0.2/opensesame_unittest/compilable.py
+--- opensesame-3.0.2.orig/opensesame_unittest/compilable.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesame_unittest/compilable.py	2015-11-17 22:26:03.235168114 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/plugins/pp_io/parallelppdev.py opensesame-2.9.1/plugins/pp_io/parallelppdev.py
---- opensesame-2.9.1.orig/plugins/pp_io/parallelppdev.py	2014-11-18 09:59:01.133538444 +0000
-+++ opensesame-2.9.1/plugins/pp_io/parallelppdev.py	2014-11-18 10:01:47.816053934 +0000
+diff -aur opensesame-3.0.2.orig/opensesame_unittest/response.py opensesame-3.0.2/opensesame_unittest/response.py
+--- opensesame-3.0.2.orig/opensesame_unittest/response.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesame_unittest/response.py	2015-11-17 22:26:03.238501400 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #-*- coding:utf-8 -*-
+ 
+ """
+diff -aur opensesame-3.0.2.orig/opensesame_unittest/syntax.py opensesame-3.0.2/opensesame_unittest/syntax.py
+--- opensesame-3.0.2.orig/opensesame_unittest/syntax.py	2015-11-17 22:24:48.446242185 +0000
++++ opensesame-3.0.2/opensesame_unittest/syntax.py	2015-11-17 22:26:03.241834686 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #-*- coding:utf-8 -*-
+ 
+ """
+diff -aur opensesame-3.0.2.orig/plugins/pp_io/parallelppdev.py opensesame-3.0.2/plugins/pp_io/parallelppdev.py
+--- opensesame-3.0.2.orig/plugins/pp_io/parallelppdev.py	2015-11-17 22:24:48.449575470 +0000
++++ opensesame-3.0.2/plugins/pp_io/parallelppdev.py	2015-11-17 22:26:03.438498544 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # parallel port access using the ppdev driver
  
  import sys
-diff -aur opensesame-2.9.1.orig/setup-android.py opensesame-2.9.1/setup-android.py
---- opensesame-2.9.1.orig/setup-android.py	2014-11-18 09:59:01.730199767 +0000
-+++ opensesame-2.9.1/setup-android.py	2014-11-18 10:01:48.739382522 +0000
+diff -aur opensesame-3.0.2.orig/run_unittests.py opensesame-3.0.2/run_unittests.py
+--- opensesame-3.0.2.orig/run_unittests.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/run_unittests.py	2015-11-17 22:26:04.538482838 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #-*- coding:utf-8 -*-
+ 
+ """
+diff -aur opensesame-3.0.2.orig/setup-android.py opensesame-3.0.2/setup-android.py
+--- opensesame-3.0.2.orig/setup-android.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/setup-android.py	2015-11-17 22:26:04.541816123 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/setup-mac.py opensesame-2.9.1/setup-mac.py
---- opensesame-2.9.1.orig/setup-mac.py	2014-11-18 09:59:01.730199767 +0000
-+++ opensesame-2.9.1/setup-mac.py	2014-11-18 10:01:48.742715838 +0000
+diff -aur opensesame-3.0.2.orig/setup-mac.py opensesame-3.0.2/setup-mac.py
+--- opensesame-3.0.2.orig/setup-mac.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/setup-mac.py	2015-11-17 22:26:04.545149409 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/setup.py opensesame-2.9.1/setup.py
---- opensesame-2.9.1.orig/setup.py	2014-11-18 09:59:01.730199767 +0000
-+++ opensesame-2.9.1/setup.py	2014-11-18 10:01:48.746049155 +0000
+diff -aur opensesame-3.0.2.orig/setup.py opensesame-3.0.2/setup.py
+--- opensesame-3.0.2.orig/setup.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/setup.py	2015-11-17 22:26:04.551815981 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/setup_shared.py opensesame-2.9.1/setup_shared.py
---- opensesame-2.9.1.orig/setup_shared.py	2014-11-18 09:59:01.733533071 +0000
-+++ opensesame-2.9.1/setup_shared.py	2014-11-18 10:01:48.749382470 +0000
+diff -aur opensesame-3.0.2.orig/setup_shared.py opensesame-3.0.2/setup_shared.py
+--- opensesame-3.0.2.orig/setup_shared.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/setup_shared.py	2015-11-17 22:26:04.555149266 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-diff -aur opensesame-2.9.1.orig/setup-win32.py opensesame-2.9.1/setup-win32.py
---- opensesame-2.9.1.orig/setup-win32.py	2014-11-18 09:59:01.730199767 +0000
-+++ opensesame-2.9.1/setup-win32.py	2014-11-18 10:01:48.742715838 +0000
+diff -aur opensesame-3.0.2.orig/setup-win32.py opensesame-3.0.2/setup-win32.py
+--- opensesame-3.0.2.orig/setup-win32.py	2015-11-17 22:24:48.579573590 +0000
++++ opensesame-3.0.2/setup-win32.py	2015-11-17 22:26:04.548482695 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2