pkgver: 2016_05_13

2 files changed, 19 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9d0005d2151e..bd341c8c8259 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=leagueoflegends
 _pkgname='League of Legends'
-pkgver=20141509
-_pkgver=9_15_2014 # installer version
+pkgver=2016_05_13
 pkgrel=1
+epoch=2
 pkgdesc='A competitive online game set in an imaginative world (Riot Games)'
 url='https://leagueoflegends.com'
 arch=(any)
@@ -10,11 +10,11 @@ depends=(winetricks alsa-lib libldap lcms2 gnutls mpg123)
 depends_x86_64=(lib32-alsa-lib lib32-libldap lib32-lcms2 lib32-gnutls lib32-mpg123)
 optdepends=(alsa-plugins libpulse)
 optdepends_x86_64=(lib32-alsa-plugins lib32-libpulse)
-makedepends=(gendesk icoutils)
-source=(https://riotgamespatcher-a.akamaihd.net/ShellInstaller/EUW/LeagueofLegends_EUW_Installer_$_pkgver.exe
+makedepends=(gendesk icoutils imagemagick)
+source=(https://riotgamespatcher-a.akamaihd.net/ShellInstaller/EUW/LeagueofLegends_EUW_Installer_$pkgver.exe
         leagueoflegends)
-sha1sums=('c18abec07aea597e0b7b9453018da05f40a1a382'
-          '32623d56c2a9e364fc5f682e37259c25f5f88b24')
+sha1sums=('d2ca75180300e02c845102fff5bdaafcadf0664d'
+          'e0420006939187ae08fce7de826c5944d9e2facb')
 install=$pkgname.install
 
 prepare() {
@@ -28,8 +28,8 @@ prepare() {
 
 build() {
   cd $srcdir
-  wine LeagueofLegends_*_Installer_9_15_2014.exe /extract
-  LD_PRELOAD=/usr/lib32/libjpeg.so.62 msiexec /i LoL.*.msi APPDIR=$(winepath -w $srcdir/LoL) /q
+  wine LeagueofLegends_*_Installer_$pkgver.exe /extract:"$(winepath -w $srcdir)" /exenoui
+  msiexec /i LoL.*.msi APPDIR=$(winepath -w $srcdir/LoL) /q
 }
 
 package() {
@@ -38,11 +38,11 @@ package() {
   install -Dm755 -g 50 leagueoflegends $pkgdir/usr/bin/leagueoflegends
   install -Dm755 leagueoflegends.desktop $pkgdir/usr/share/applications/leagueoflegends.desktop
   cd $srcdir/LoL
-  install -dm775 -g 50 $pkgdir/var/games/{,$pkgname}
-  cp -r * $pkgdir/var/games/$pkgname
-  chgrp -R 50 $pkgdir/var/games/$pkgname
-  find $pkgdir/var/games/$pkgname -type d -exec chmod 775 {} +
-  find $pkgdir/var/games/$pkgname -type f -exec chmod 764 {} +
+  install -dm775 -g 50 $pkgdir/opt/games/{,$pkgname}
+  cp -r * $pkgdir/opt/games/$pkgname
+  chgrp -R 50 $pkgdir/opt/games/$pkgname
+  find $pkgdir/opt/games/$pkgname -type d -exec chmod 775 {} +
+  find $pkgdir/opt/games/$pkgname -type f -exec chmod 764 {} +
   cd $srcdir
   convert LoL/RADS/system/lol.ico lol.png
   install -Dm644 lol-3.png $pkgdir/usr/share/pixmaps/$pkgname.png
diff --git a/leagueoflegends b/leagueoflegends
index 8a3b8a593dab..c9ea2903c303 100755
--- a/leagueoflegends
+++ b/leagueoflegends
@@ -1,18 +1,12 @@
 #!/usr/bin/env sh
 
-if [ ! -d $HOME/.leagueoflegends ]; then
-  mkdir -p $HOME/.leagueoflegends
-  ln -s /var/games/leagueoflegends/lol.launcher.admin.exe $HOME/.leagueoflegends
-  ln -s /var/games/leagueoflegends/lol.launcher.exe $HOME/.leagueoflegends
-  ln -s /var/games/leagueoflegends/RADS $HOME/.leagueoflegends
-fi
+mkdir -p $HOME/.leagueoflegends
+ln -sf /opt/games/leagueoflegends/lol.launcher.admin.exe $HOME/.leagueoflegends
+ln -sf /opt/games/leagueoflegends/lol.launcher.exe $HOME/.leagueoflegends
+ln -sf /opt/games/leagueoflegends/RADS $HOME/.leagueoflegends
 
 [ $(uname -m) = 'x86_64' ] && export WINEARCH=win32 WINEPREFIX=$HOME/.wine32
 winetricks -q adobeair vcrun2005 vcrun2008 d3dx9 d3dx10 wininet corefonts
-#export WINEDLLOVERRIDES='' #dnsapi=' #,wininet='
-if [ $(uname -m) = 'x86_64' ]; then
-  LD_PRELOAD=/usr/lib32/libjpeg.so.62 wine $HOME/.leagueoflegends/lol.launcher.admin.exe
-else
-  wine $HOME/.leagueoflegends/lol.launcher.admin.exe
-fi
+export WINEDLLOVERRIDES='wininet=b,n'
+wine $HOME/.leagueoflegends/lol.launcher.admin.exe