First Loen commit

2 files changed, 29 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dbd3c04d770..1f23024d87cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = playonlinux-git
 	pkgdesc = GUI for managing Windows programs under linux
-	pkgver = 4.2.9.r1.g1157b14
+	pkgver = 4.2.10.r19.gfe283cd
 	pkgrel = 1
 	epoch = 1
 	url = http://www.playonlinux.com/
 	arch = any
 	license = GPL
-	depends = wine
 	depends = imagemagick
 	depends = xterm
-	depends = wxpython2.8
+	depends = wxpython
 	depends = cabextract
 	depends = unzip
 	depends = mesa-demos
@@ -23,7 +22,7 @@ pkgbase = playonlinux-git
 	provides = playonlinux
 	conflicts = playonlinux
 	options = !strip
-	source = playonlinux::git://github.com/PlayOnLinux/POL-POM-4.git
+	source = git://github.com/PlayOnLinux/POL-POM-4.git
 	md5sums = SKIP
 
 pkgname = playonlinux-git
diff --git a/PKGBUILD b/PKGBUILD
index 3966b0ce5f29..c32ff1121422 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,50 @@
-# Maintainer: Justin Dray <justin@dray.be>
+# Maintainer: Christopher Loen <christopherloen at gmail dot com>
+# Contributor: Justin Dray <justin@dray.be>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: K. Hampf <khampf@users.sourceforge.net>
 # Contributor: Skunnyk <skunnyk@archlinux.fr>
-
-_pkgname=playonlinux
-pkgname=$_pkgname-git
-pkgver=4.2.9.r1.g1157b14
+gitdir='POL-POM-4'
+_pkgname='playonlinux'
+pkgname="${_pkgname}-git"
+pkgver=4.2.10.r19.gfe283cd
 pkgrel=1
 epoch=1
 pkgdesc="GUI for managing Windows programs under linux"
 url="http://www.playonlinux.com/"
 license=('GPL')
-depends=('wine' 'imagemagick' 'xterm' 'wxpython2.8' 'cabextract' 'unzip' 'mesa-demos' 'gnupg'
+depends=( 'imagemagick' 'xterm' 'wxpython' 'cabextract' 'unzip' 'mesa-demos' 'gnupg'
          'icoutils' 'xdg-user-dirs' 'libxmu' 'netcat' 'wget' 'p7zip')
 arch=('any')
-provides='playonlinux'
-conflicts='playonlinux'
-source=("$_pkgname::git://github.com/PlayOnLinux/POL-POM-4.git")
+provides=('playonlinux')
+conflicts=('playonlinux')
+source=("git://github.com/PlayOnLinux/POL-POM-4.git")
 options=(!strip)
 md5sums=('SKIP')
 
 pkgver() {
-	cd "$_pkgname"
+	cd "${srcdir}/${gitdir}"
 	git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
+build() {
+        cd "${srcdir}/${gitdir}"
+        make
+}
 package() {
-	cd "$srcdir/$_pkgname"
+	cd "${srcdir}/${gitdir}"
 
-	install -d "$pkgdir/usr/share/$_pkgname"
-	install -d "$pkgdir/usr/bin"
-	cp -r "$srcdir/$_pkgname/" "$pkgdir/usr/share/"
-	rm -rf "$pkgdir/usr/share/$_pkgname/.git"
+	install -dm755 "${pkgdir}/usr/share/${_pkgname}"
+	install -dm755 "${pkgdir}/usr/bin"
+	cp -rf * "${pkgdir}/usr/share/${_pkgname}/"
+	rm -rf "${pkgdir}/usr/share/${_pkgname}/.git"
 
-	echo '#!/bin/bash' > "$pkgdir/usr/bin/$_pkgname"
-	echo "/usr/share/$_pkgname/$_pkgname \"\$@\"" >> "$pkgdir/usr/bin/$_pkgname"
-	chmod +x "$pkgdir/usr/bin/$_pkgname"
+	echo '#!/bin/bash' > "${pkgdir}/usr/bin/${_pkgname}"
+	echo "/usr/share/${_pkgname}/${_pkgname} \"\$@\"" >> "${pkgdir}/usr/bin/${_pkgname}"
+	chmod +x "${pkgdir}/usr/bin/${_pkgname}"
 
 	# Needed for wxpython2.8 support, wxpython 3.0 is buggy with POL
-	sed -i "s/wxversion.ensureMinimal/wxversion.select/g" "$pkgdir/usr/share/$_pkgname/python/mainwindow.py"
+	#sed -i "s/wxversion.ensureMinimal/wxversion.select/g" "${pkgdir}/usr/share/${_pkgname}/python/mainwindow.py"
 
-	install -D -m644 "$srcdir/$_pkgname/etc/PlayOnLinux.desktop" "$pkgdir/usr/share/applications/playonlinux.desktop"
-	sed -i 's/ %F//g' "$pkgdir/usr/share/applications/playonlinux.desktop"
+	install -D -m644 etc/PlayOnLinux.desktop "${pkgdir}/usr/share/applications/playonlinux.desktop"
+	sed -i 's/ %F//g' "${pkgdir}/usr/share/applications/playonlinux.desktop"
 }