Update to 2.2.4

3 files changed, 50 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a054ba7bfa8d..8fd0fbed94df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,31 @@
 pkgbase = lantern
 	pkgdesc = Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)
-	pkgver = 2.0.10
+	pkgver = 2.2.4
 	pkgrel = 1
 	url = https://getlantern.org
 	install = lantern.install
 	arch = i686
 	arch = x86_64
 	license = Apache
-	depends = hicolor-icon-theme
-	depends = bzip2
-	depends = dbus
-	depends = glib2
-	depends = gtk3
+	makedepends = npm
+	makedepends = go>=1.6
+	makedepends = make
+	makedepends = gulp
 	depends = libappindicator-gtk3
-	depends = mesa
 	depends = xcb-util
 	depends = xdg-utils
-	depends = zlib
+	conflicts = lantern-bin
+	conflicts = lantern-headless
+	conflicts = lantern-headless-git
 	options = !emptydirs
 	options = !strip
 	options = !docs
+	source = https://github.com/getlantern/lantern/archive/2.2.4.tar.gz
 	source = lantern.service
+	source = git-update-index.patch
+	sha1sums = 26fa91dfe92f90c677aa8cc0f410486dffed9e43
 	sha1sums = da705ba2fa3608a17258009b933e8bb58b3172a2
-	source_i686 = lantern-installer-32-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb
-	sha1sums_i686 = cace8d813aa4148ab7a5729c377b5c10fd8290b9
-	source_x86_64 = lantern-installer-64-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb
-	sha1sums_x86_64 = e7631e744d4e3b27703a3563d670063fe38852f7
+	sha1sums = 0949f76ee7d695156c0a85565ce516a7f3637b2a
 
 pkgname = lantern
 
diff --git a/PKGBUILD b/PKGBUILD
index 989fa2a18623..a1185facc8c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,40 @@
-# Submitter: neo.shadowsocks<neo.shadowsocks AT gmx.com>
-# Maintainer: Kars Wang <jaklsy g-mail>
+# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Contributor: neo.shadowsocks<neo.shadowsocks AT gmx.com>
+# Contributor: Kars Wang <jaklsy g-mail>
 
 pkgname=lantern
-pkgver=2.0.10
+pkgver=2.2.4
 pkgrel=1
 pkgdesc='Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)'
 arch=('i686' 'x86_64')
 url='https://getlantern.org'
 license=('Apache')
-
-# neo: I got it by ldd the lantern-binary as deb metadata doesn't provides it,
-# and remove duplicated, like atk required by gtk3
-depends=('hicolor-icon-theme' 'bzip2' 'dbus' 'glib2' 'gtk3' 'libappindicator-gtk3' 'mesa' 'xcb-util' 'xdg-utils' 'zlib')
+depends=('libappindicator-gtk3' 'xcb-util' 'xdg-utils')
+makedepends=('go>=1.6' 'make' 'gulp' 'npm')
+conflicts=('lantern-bin' 'lantern-headless' 'lantern-headless-git')
 options=('!emptydirs' '!strip' '!docs')
 install=$pkgname.install
-source=('lantern.service')
-source_i686=('lantern-installer-32-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb')
-source_x86_64=('lantern-installer-64-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb')
-sha1sums=('da705ba2fa3608a17258009b933e8bb58b3172a2')
-sha1sums_i686=('cace8d813aa4148ab7a5729c377b5c10fd8290b9')
-sha1sums_x86_64=('e7631e744d4e3b27703a3563d670063fe38852f7')
+source=("https://github.com/getlantern/lantern/archive/${pkgver}.tar.gz"
+        'lantern.service'
+        'git-update-index.patch')
 
-package() {
-    msg2 'Extracting the data.tar.xz...'
-    bsdtar -xf data.tar.xz -C "${pkgdir}/"
+sha1sums=('26fa91dfe92f90c677aa8cc0f410486dffed9e43'
+          'da705ba2fa3608a17258009b933e8bb58b3172a2'
+          '0949f76ee7d695156c0a85565ce516a7f3637b2a')
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    patch -p1 < ../git-update-index.patch
+}
 
-    msg2 'Install systemd service file...'
-    install -Dm644 "${srcdir}/lantern.service" "${pkgdir}/usr/lib/systemd/user/lantern.service"
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    make lantern
+}
+
+package() {
+    install -Dm755 "${srcdir}/${pkgname}-${pkgver}/lantern"    "${pkgdir}/usr/bin/lantern"
+    install -Dm644 "${srcdir}/lantern.service"                  "${pkgdir}/usr/lib/systemd/user/lantern.service"
 }
diff --git a/git-update-index.patch b/git-update-index.patch
new file mode 100644
index 000000000000..6aaede335ebc
--- /dev/null
+++ b/git-update-index.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2016-05-17 20:25:35.000000000 +0200
++++ b/Makefile	2016-05-22 19:58:40.180543827 +0200
+@@ -193,7 +193,6 @@
+ 	APP="$$LANTERN_UI/app" && \
+ 	DIST="$$LANTERN_UI/dist" && \
+ 	echo 'var LANTERN_BUILD_REVISION = "$(GIT_REVISION_SHORTCODE)";' > $$APP/js/revision.js && \
+-	git update-index --assume-unchanged $$APP/js/revision.js && \
+ 	DEST="$@" && \
+ 	cd $$LANTERN_UI && \
+ 	npm install && \