Update to 3.0.5-1

3 files changed, 89 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bd1821dfc83..62a891c52ed2 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 = 3.0.4
+	pkgver = 3.0.5
 	pkgrel = 1
 	url = http://www.cogsci.nl/software/opensesame
 	arch = any
@@ -23,10 +23,10 @@ pkgbase = opensesame
 	optdepends = python2-pyflakes: validation of python scripts
 	optdepends = ipython2: improved debugging
 	options = !emptydirs
-	source = opensesame-3.0.4::git://github.com/smathot/OpenSesame.git#tag=release/3.0.4
+	source = opensesame-3.0.5::git://github.com/smathot/OpenSesame.git#tag=release/3.0.5
 	source = python2.patch
 	md5sums = SKIP
-	md5sums = 3620ccb77431d68a968a6d17ed9c5568
+	md5sums = 05241d9c2e0881c6eb3f4f7745aac4fb
 
 pkgname = opensesame
 
diff --git a/PKGBUILD b/PKGBUILD
index 14df7079f820..5532229a909b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Martin Corley <Martin.Corley@ed.ac.uk>
 
 pkgname=opensesame
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 pkgdesc="A graphical, open-source experiment builder for the social sciences, with ability to deploy on Android"
 arch=(any)
@@ -28,10 +28,10 @@ optdepends=('psychopy: PsychoPy backend'
 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/3.0.4'
+source=("$pkgname-$pkgver"::'git://github.com/smathot/OpenSesame.git#tag=release/3.0.5'
 python2.patch)
 md5sums=('SKIP'
-         '3620ccb77431d68a968a6d17ed9c5568')
+         '05241d9c2e0881c6eb3f4f7745aac4fb')
 
 fix_links() {
   cd  "$pkgdir/usr/share/opensesame/resources/theme/gnome/os-custom-icons/"
diff --git a/python2.patch b/python2.patch
index 1547e7719efe..4f7911c1c17b 100644
--- a/python2.patch
+++ b/python2.patch
@@ -1,6 +1,6 @@
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/architecture.py opensesame-3.0.5/dev-scripts/architecture.py
+--- opensesame-3.0.5.orig/dev-scripts/architecture.py	2016-01-13 11:36:11.426931055 +0000
++++ opensesame-3.0.5/dev-scripts/architecture.py	2016-01-13 11:38:04.016150382 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
@@ -16,182 +16,198 @@ diff -aur opensesame-3.0.2.orig/dev-scripts/architecture.py opensesame-3.0.2/dev
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/check_ts.py opensesame-3.0.5/dev-scripts/check_ts.py
+--- opensesame-3.0.5.orig/dev-scripts/check_ts.py	2016-01-13 11:36:11.450264226 +0000
++++ opensesame-3.0.5/dev-scripts/check_ts.py	2016-01-13 11:38:04.019483692 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/docstruct.py opensesame-3.0.5/dev-scripts/docstruct.py
+--- opensesame-3.0.5.orig/dev-scripts/docstruct.py	2016-01-13 11:36:11.636929595 +0000
++++ opensesame-3.0.5/dev-scripts/docstruct.py	2016-01-13 11:38:04.022817002 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/extract_translatables.py opensesame-3.0.5/dev-scripts/extract_translatables.py
+--- opensesame-3.0.5.orig/dev-scripts/extract_translatables.py	2016-01-13 11:36:11.680262627 +0000
++++ opensesame-3.0.5/dev-scripts/extract_translatables.py	2016-01-13 11:38:04.026150312 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/item-help.py opensesame-3.0.5/dev-scripts/item-help.py
+--- opensesame-3.0.5.orig/dev-scripts/item-help.py	2016-01-13 11:36:11.680262627 +0000
++++ opensesame-3.0.5/dev-scripts/item-help.py	2016-01-13 11:38:04.029483623 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/dev-scripts/update-hidden.py opensesame-3.0.5/dev-scripts/update-hidden.py
+--- opensesame-3.0.5.orig/dev-scripts/update-hidden.py	2016-01-13 11:36:11.683595938 +0000
++++ opensesame-3.0.5/dev-scripts/update-hidden.py	2016-01-13 11:38:04.029483623 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/opensesame opensesame-3.0.5/opensesame
+--- opensesame-3.0.5.orig/opensesame	2016-01-13 11:36:11.853594756 +0000
++++ opensesame-3.0.5/opensesame	2016-01-13 11:38:04.706145607 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/opensesameandroid.py opensesame-3.0.5/opensesameandroid.py
+--- opensesame-3.0.5.orig/opensesameandroid.py	2016-01-13 11:36:11.873594618 +0000
++++ opensesame-3.0.5/opensesameandroid.py	2016-01-13 11:38:04.739478709 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/opensesamerun opensesame-3.0.5/opensesamerun
+--- opensesame-3.0.5.orig/opensesamerun	2016-01-13 11:36:11.880261237 +0000
++++ opensesame-3.0.5/opensesamerun	2016-01-13 11:38:04.742812020 +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/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
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/backends.py opensesame-3.0.5/opensesame_unittest/backends.py
+--- opensesame-3.0.5.orig/opensesame_unittest/backends.py	2016-01-13 11:36:11.853594756 +0000
++++ opensesame-3.0.5/opensesame_unittest/backends.py	2016-01-13 11:38:04.709478917 +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/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
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/color.py opensesame-3.0.5/opensesame_unittest/color.py
+--- opensesame-3.0.5.orig/opensesame_unittest/color.py	2016-01-13 11:36:11.853594756 +0000
++++ opensesame-3.0.5/opensesame_unittest/color.py	2016-01-13 11:38:04.712812227 +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/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
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/compilable.py opensesame-3.0.5/opensesame_unittest/compilable.py
+--- opensesame-3.0.5.orig/opensesame_unittest/compilable.py	2016-01-13 11:36:11.853594756 +0000
++++ opensesame-3.0.5/opensesame_unittest/compilable.py	2016-01-13 11:38:04.716145538 +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/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
+@@ -51,7 +51,7 @@
+ 		compile(src, u'<string>', u'exec')
+ 		self.assertTrue(
+ 			usrc.startswith(
+-				u'#!/usr/bin/env python\n#-*- coding:utf-8 -*-\n') or \
++				u'#!/usr/bin/env python2\n#-*- coding:utf-8 -*-\n') or \
+ 			usrc.startswith(
+ 				u'#-*- coding:utf-8 -*-\n'))
+ 		if not path.endswith(u'py3compat.py'):
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/headless.py opensesame-3.0.5/opensesame_unittest/headless.py
+--- opensesame-3.0.5.orig/opensesame_unittest/headless.py	2016-01-13 11:36:11.873594618 +0000
++++ opensesame-3.0.5/opensesame_unittest/headless.py	2016-01-13 11:38:04.732812089 +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
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/response.py opensesame-3.0.5/opensesame_unittest/response.py
+--- opensesame-3.0.5.orig/opensesame_unittest/response.py	2016-01-13 11:36:11.873594618 +0000
++++ opensesame-3.0.5/opensesame_unittest/response.py	2016-01-13 11:38:04.736145399 +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
+diff -aur opensesame-3.0.5.orig/opensesame_unittest/syntax.py opensesame-3.0.5/opensesame_unittest/syntax.py
+--- opensesame-3.0.5.orig/opensesame_unittest/syntax.py	2016-01-13 11:36:11.873594618 +0000
++++ opensesame-3.0.5/opensesame_unittest/syntax.py	2016-01-13 11:38:04.739478709 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
- # parallel port access using the ppdev driver
+ #-*- coding:utf-8 -*-
  
- import sys
-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
+ """
+diff -aur opensesame-3.0.5.orig/plugins/pp_io/parallelppdev.py opensesame-3.0.5/plugins/pp_io/parallelppdev.py
+--- opensesame-3.0.5.orig/plugins/pp_io/parallelppdev.py	2016-01-13 11:36:11.893594478 +0000
++++ opensesame-3.0.5/plugins/pp_io/parallelppdev.py	2016-01-13 11:38:04.892810981 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #-*- coding:utf-8 -*-
+ # NO UNITTEST
+ # parallel port access using the ppdev driver
+diff -aur opensesame-3.0.5.orig/run_unittests.py opensesame-3.0.5/run_unittests.py
+--- opensesame-3.0.5.orig/run_unittests.py	2016-01-13 11:36:12.656922507 +0000
++++ opensesame-3.0.5/run_unittests.py	2016-01-13 11:38:05.849471028 +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
+diff -aur opensesame-3.0.5.orig/setup-android.py opensesame-3.0.5/setup-android.py
+--- opensesame-3.0.5.orig/setup-android.py	2016-01-13 11:36:12.660255817 +0000
++++ opensesame-3.0.5/setup-android.py	2016-01-13 11:38:05.852804338 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/setup-mac.py opensesame-3.0.5/setup-mac.py
+--- opensesame-3.0.5.orig/setup-mac.py	2016-01-13 11:36:12.660255817 +0000
++++ opensesame-3.0.5/setup-mac.py	2016-01-13 11:38:05.856137648 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/setup.py opensesame-3.0.5/setup.py
+--- opensesame-3.0.5.orig/setup.py	2016-01-13 11:36:12.676922369 +0000
++++ opensesame-3.0.5/setup.py	2016-01-13 11:38:05.862804269 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/setup_shared.py opensesame-3.0.5/setup_shared.py
+--- opensesame-3.0.5.orig/setup_shared.py	2016-01-13 11:36:12.676922369 +0000
++++ opensesame-3.0.5/setup_shared.py	2016-01-13 11:38:05.862804269 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  #-*- coding:utf-8 -*-
  
  """
-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
+diff -aur opensesame-3.0.5.orig/setup-win32.py opensesame-3.0.5/setup-win32.py
+--- opensesame-3.0.5.orig/setup-win32.py	2016-01-13 11:36:12.670255748 +0000
++++ opensesame-3.0.5/setup-win32.py	2016-01-13 11:38:05.859470959 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2