[arch-commits] Commit in playonlinux/trunk (PKGBUILD use-python2.patch)

[Laurent Carlier]

    Date: Wednesday, January 1, 2014 @ 07:45:31
  Author: lcarlier
Revision: 103264

upgpkg: playonlinux 4.2.2-1

upstream update 4.2.2

Modified:
  playonlinux/trunk/PKGBUILD
Deleted:
  playonlinux/trunk/use-python2.patch

-------------------+
 PKGBUILD          |   15 +++-----------
 use-python2.patch |   55 ----------------------------------------------------
 2 files changed, 4 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-01 03:12:49 UTC (rev 103263)
+++ PKGBUILD	2014-01-01 06:45:31 UTC (rev 103264)
@@ -3,7 +3,7 @@
 # Contributor: Skunnyk <skunnyk at archlinux.fr>
 
 pkgname=playonlinux
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 pkgdesc="GUI for managing Windows programs under linux"
 url="http://www.playonlinux.com/"
@@ -12,18 +12,14 @@
          'icoutils' 'xdg-user-dirs' 'libxmu' 'netcat' 'wget' 'p7zip')
 arch=('any')
 source=(http://www.playonlinux.com/script_files/PlayOnLinux/${pkgver/.0/}/PlayOnLinux_${pkgver/.0/}.tar.gz
-        PlayOnLinux.desktop
-        use-python2.patch)
+        PlayOnLinux.desktop)
 options=(!strip)
-md5sums=('d257235c548d70dc4a8820f06ee4d314'
-         'c35b61fb168c4ef7740ad113996ea359'
-         '39a97b77d69431429e6d9d80f826fd17')
+md5sums=('d038bfcadb2626bcd429746afa984831'
+         'c35b61fb168c4ef7740ad113996ea359')
 
 package() {
   cd "$srcdir/$pkgname"
 
-  patch -Np1 -i ../use-python2.patch
-
   install -d $pkgdir/usr/share/$pkgname
   install -d $pkgdir/usr/bin 
   cp -r $srcdir/$pkgname/ $pkgdir/usr/share/
@@ -35,6 +31,3 @@
   install -D -m644 $srcdir/$pkgname/etc/playonlinux32.png $pkgdir/usr/share/pixmaps/playonlinux32.png 
   install -D -m644 $srcdir/PlayOnLinux.desktop $pkgdir/usr/share/applications/playonlinux.desktop 
 }
-md5sums=('4f80195c28d5424045b6471032d173b3'
-         'c35b61fb168c4ef7740ad113996ea359'
-         '39a97b77d69431429e6d9d80f826fd17')

Deleted: use-python2.patch
===================================================================
--- use-python2.patch	2014-01-01 03:12:49 UTC (rev 103263)
+++ use-python2.patch	2014-01-01 06:45:31 UTC (rev 103264)
@@ -1,55 +0,0 @@
-diff -Nur playonlinux.orig/playonlinux playonlinux/playonlinux
---- playonlinux.orig/playonlinux	2013-01-14 12:13:32.000000000 +0100
-+++ playonlinux/playonlinux	2013-01-20 14:27:38.557779108 +0100
-@@ -69,7 +69,7 @@
- 
- [ "$(uname -s)" = "Linux" ] || die "This script must be run on a linux system"
- 
--export PYTHON="python"
-+export PYTHON="python2"
- export POL_OS="Linux"
- export UBUNTU_MENUPROXY=0 
- export MACHTYPE
-@@ -141,4 +141,4 @@
- fi
- 
- [ $exitcode -eq 63 ] && exec "$POLDIR/playonlinux"
--exit $exitcode
-\ Pas de fin de ligne à la fin du fichier
-+exit $exitcode
-diff -Nur playonlinux.orig/playonlinux-bash playonlinux/playonlinux-bash
---- playonlinux.orig/playonlinux-bash	2013-01-14 12:13:32.000000000 +0100
-+++ playonlinux/playonlinux-bash	2013-01-20 14:28:05.317278109 +0100
-@@ -26,7 +26,7 @@
- shift
- if [ "$PYTHON" = "" ]
- then
--	PYTHON="python"
-+	PYTHON="python2"
- fi
- if [ "$SCRIPTNAME" = "" ]
- then
-diff -Nur playonlinux.orig/playonlinux-pkg playonlinux/playonlinux-pkg
---- playonlinux.orig/playonlinux-pkg	2013-01-14 12:13:32.000000000 +0100
-+++ playonlinux/playonlinux-pkg	2013-01-20 14:29:09.846069548 +0100
-@@ -29,7 +29,7 @@
- 	CURDIR="$(pwd)"
- 	export MACHTYPE
- 	cd "$WorkingDirectory"
--	python "$CURDIR/python/wrapper.py" "$CURDIR/bash/$(basename "$0")" "$@"
-+	python2 "$CURDIR/python/wrapper.py" "$CURDIR/bash/$(basename "$0")" "$@"
- else
- 	bash "$PLAYONLINUX/bash/$(basename "$0")" "$@"
- fi
-diff -Nur playonlinux.orig/playonlinux-url_handler playonlinux/playonlinux-url_handler
---- playonlinux.orig/playonlinux-url_handler	2013-01-14 12:13:32.000000000 +0100
-+++ playonlinux/playonlinux-url_handler	2013-01-20 14:30:35.361133674 +0100
-@@ -29,7 +29,7 @@
- 	CURDIR="$(pwd)"
- 	export MACHTYPE
- 	cd "$WorkingDirectory"
--	python "$CURDIR/python/wrapper.py" "$CURDIR/bash/$(basename "$0")" "$@"
-+	python2 "$CURDIR/python/wrapper.py" "$CURDIR/bash/$(basename "$0")" "$@"
- else
- 	bash "$PLAYONLINUX/bash/$(basename "$0")" "$@"
- fi