some fixes

3 files changed, 57 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 592e05d98413..26008428196f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mcpelauncher-git
 	pkgdesc = Launch MCPE on Linux!
-	pkgver = 551e58d
+	pkgver = 20180405
 	pkgrel = 1
 	url = https://github.com/MCMrARM/mcpelauncher-linux
 	arch = x86_64
@@ -8,10 +8,8 @@ pkgbase = mcpelauncher-git
 	makedepends = cmake
 	makedepends = lib32-zlib
 	makedepends = lib32-libx11
-	makedepends = lib32-libzip
 	makedepends = lib32-libpng
 	makedepends = lib32-util-linux
-	makedepends = lib32-curl
 	makedepends = lib32-openssl
 	makedepends = lib32-mesa
 	makedepends = protobuf
@@ -19,19 +17,20 @@ pkgbase = mcpelauncher-git
 	depends = lib32-gcc-libs
 	depends = lib32-libstdc++5
 	depends = lib32-gtk2
-	depends = lib32-gtkglext
 	depends = lib32-alsa-lib
 	depends = lib32-alsa-plugins
 	depends = lib32-nss
 	depends = lib32-libxss
 	depends = lib32-gconf
 	depends = lib32-libxtst
-	depends = lib32-libudev0
+	depends = lib32-libevdev
 	depends = lib32-libprotobuf
+	depends = lib32-libzip
+	depends = lib32-curl
 	source = git+https://github.com/MCMrARM/mcpelauncher-linux.git
-	source = https://gist.github.com/ErnyTech/986d289e504dab636e594f716396ba06/raw/d74ab4edba7d5d1651c404fa1da40495b2f8f283/mcpelauncher-git.sh
-	md5sums = SKIP
+	source = mcpelauncher-git.sh
 	md5sums = SKIP
+	md5sums = bf0df91cd380ebd74f46e79416d37192
 
 pkgname = mcpelauncher-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d1ffd38161e5..173a923038ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: ErnyTech <erny.castell[at]gmail[dot]com>
 pkgname=mcpelauncher-git
-pkgver=551e58d
+pkgver=20180405
 pkgrel=1
 pkgdesc="Launch MCPE on Linux!"
 url="https://github.com/MCMrARM/mcpelauncher-linux"
 arch=('x86_64')
 license=('BSD 2-clause + Other')
-depends=('lib32-glibc' 'lib32-gcc-libs' 'lib32-libstdc++5' 'lib32-gtk2' 'lib32-gtkglext' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-nss' 'lib32-libxss' 'lib32-gconf' 'lib32-libxtst' 'lib32-libudev0' 'lib32-libprotobuf')
-makedepends=('cmake' 'lib32-zlib' 'lib32-libx11' 'lib32-libzip' 'lib32-libpng' 'lib32-util-linux' 'lib32-curl' 'lib32-openssl' 'lib32-mesa' 'protobuf')
+depends=('lib32-glibc' 'lib32-gcc-libs' 'lib32-libstdc++5' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-nss' 'lib32-libxss' 'lib32-gconf' 'lib32-libxtst' 'lib32-libevdev' 'lib32-libprotobuf' 'lib32-libzip' 'lib32-curl')
+makedepends=('cmake' 'lib32-zlib' 'lib32-libx11' 'lib32-libpng' 'lib32-util-linux' 'lib32-openssl' 'lib32-mesa' 'protobuf')
 source=('git+https://github.com/MCMrARM/mcpelauncher-linux.git'
-        "https://gist.github.com/ErnyTech/986d289e504dab636e594f716396ba06/raw/d74ab4edba7d5d1651c404fa1da40495b2f8f283/mcpelauncher-git.sh")
-md5sums=('SKIP' 'SKIP')
+        "mcpelauncher-git.sh")
+md5sums=('SKIP'
+         'bf0df91cd380ebd74f46e79416d37192')
 prepare() {
    cd $srcdir/mcpelauncher-linux
    git submodule update --init --recursive
@@ -20,28 +21,34 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/mcpelauncher-linux
-  cmake .
-  make
+    cd $srcdir/mcpelauncher-linux
+    cmake .
+    make
 }
 
 package() {
-  install -Ddm655 $srcdir/mcpelauncher-linux/libs/ $pkgdir/opt/$pkgname/libs
-  cp -R $srcdir/mcpelauncher-linux/libs/* $pkgdir/opt/$pkgname/libs
-  chmod -R 655 $pkgdir/opt/$pkgname/libs
-  install -Dm655 $srcdir/mcpelauncher-linux/mcpelauncher-icon.png $pkgdir/opt/$pkgname
-  install -Dm755 $srcdir/mcpelauncher-linux/mcpelauncher $pkgdir/opt/$pkgname
-  install -Dm755 $srcdir/$pkgname.sh $pkgdir/usr/bin/mcpelauncher
-  ln -s /opt/$pkgname/libs/cef/bin/icudtl.dat  $pkgdir/opt/$pkgname
-  ln -s /opt/$pkgname/libs/cef/lib/libcef.so $pkgdir/opt/$pkgname
-  ln -s /opt/$pkgname/libs/cef/bin/natives_blob.bin $pkgdir/opt/$pkgname
-  ln -s /opt/$pkgname/libs/cef/bin/snapshot_blob.bin $pkgdir/opt/$pkgname 
-  install -Ddm655 $srcdir/mcpelauncher-linux/src/initial_setup_resources $pkgdir/opt/$pkgname/src/initial_setup_resources
-  cp -R $srcdir/mcpelauncher-linux/src/initial_setup_resources/* $pkgdir/opt/$pkgname/src/initial_setup_resources
-  chmod -R 655 $pkgdir/opt/$pkgname/src/initial_setup_resources
-  install -Ddm655 $srcdir/mcpelauncher-linux/gplay_api $pkgdir/opt/$pkgname/gplay_api
-  cp -R $srcdir/mcpelauncher-linux/gplay_api/* $pkgdir/opt/$pkgname/gplay_api
-  chmod -R 655 $pkgdir/opt/$pkgname/gplay_api
+    install -Ddm655 $srcdir/mcpelauncher-linux/libs/ $pkgdir/opt/$pkgname/libs
+    cp -R $srcdir/mcpelauncher-linux/libs/* $pkgdir/opt/$pkgname/libs
+    chmod -R 655 $pkgdir/opt/$pkgname/libs
+    install -Dm655 $srcdir/mcpelauncher-linux/mcpelauncher-icon.png $pkgdir/opt/$pkgname
+    mkdir -p $pkgdir/usr/share/pixmaps
+    ln -s /opt/$pkgname/mcpelauncher-icon.png $pkgdir/usr/share/pixmaps/mcpelauncher-icon.png
+    install -Dm755 $srcdir/mcpelauncher-linux/mcpelauncher.desktop $pkgdir/usr/share/applications/mcpelauncher.desktop
+    install -Dm755 $srcdir/mcpelauncher-linux/mcpelauncher $pkgdir/opt/$pkgname
+    install -Dm755 $srcdir/$pkgname.sh $pkgdir/usr/bin/mcpelauncher
+    install -Dm755 $srcdir/mcpelauncher-linux/server $pkgdir/opt/$pkgname
+    ln -s /opt/$pkgname/server $pkgdir/usr/bin/mcpelauncher-server
+    ln -s /opt/$pkgname/libs/cef/bin/icudtl.dat  $pkgdir/opt/$pkgname
+    ln -s /opt/$pkgname/libs/cef/lib/libcef.so $pkgdir/opt/$pkgname
+    ln -s /opt/$pkgname/libs/cef/bin/natives_blob.bin $pkgdir/opt/$pkgname
+    ln -s /opt/$pkgname/libs/cef/bin/snapshot_blob.bin $pkgdir/opt/$pkgname
+    install -Ddm655 $srcdir/mcpelauncher-linux/src/client_resources/ $pkgdir/opt/$pkgname/src/client_resources/
+#     cp -R $srcdir/mcpelauncher-linux/src/client_resources/* $pkgdir/opt/$pkgname/src/client_resources/
+    chmod -R 655 $pkgdir/opt/$pkgname/src/client_resources/
+    install -Ddm655 $srcdir/mcpelauncher-linux/src/ui/browser/resources $pkgdir/opt/$pkgname/src/ui/browser/resources
+    cp -R $srcdir/mcpelauncher-linux/src/ui/browser/resources/* $pkgdir/opt/$pkgname/src/ui/browser/resources
+    chmod -R 655 $pkgdir/opt/$pkgname/src/ui/browser/resources
+    install -Ddm655 $srcdir/mcpelauncher-linux/gplay_api $pkgdir/opt/$pkgname/gplay_api
+    cp -R $srcdir/mcpelauncher-linux/gplay_api/* $pkgdir/opt/$pkgname/gplay_api
+    chmod -R 655 $pkgdir/opt/$pkgname/gplay_api
 }
-
-
diff --git a/mcpelauncher-git.sh b/mcpelauncher-git.sh
new file mode 100755
index 000000000000..ec6ee1e1d80a
--- /dev/null
+++ b/mcpelauncher-git.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+mkdir -p $HOME/.local/share/mcpelauncher
+cd $HOME/.local/share/mcpelauncher
+mkdir -p libs
+for i in /opt/mcpelauncher-git/libs/*; do
+    i=$(basename $i)
+    if ! [[ -d libs/$i ]]; then
+        ln -s /opt/mcpelauncher-git/libs/$i libs/$i
+    fi
+done
+if ! [[ -f mcpelauncher-icon.png ]]; then
+    ln -s /opt/mcpelauncher-git/mcpelauncher-icon.png mcpelauncher-icon.png
+fi
+if ! [[ -f src ]]; then
+    ln -s /opt/mcpelauncher-git/src src
+fi
+export LD_LIBRARY_PATH=/opt/mcpelauncher-git/
+/opt/mcpelauncher-git/mcpelauncher "$@"