Initial commit of Beaker browser

4 files changed, 79 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 297998c8dedb..f4fd1d723ca5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,45 @@
 pkgbase = beaker
-	pkgdesc = Common files for beaker and client tools for beaker job maintenance.
-	pkgver = 0.9.1
+	pkgdesc = Experimental peer-to-peer web browser
+	pkgver = 0.8.8
 	pkgrel = 1
-	url = https://fedorahosted.org/beaker
+	url = https://beakerbrowser.com
 	arch = i686
 	arch = x86_64
-	license = GPLv2
+	license = MIT
+	makedepends = npm
+	makedepends = git
 	makedepends = python2
-	makedepends = docutils
-	makedepends = python2-distribute
-	makedepends = python-kobo
-	makedepends = python2-krbv
-	makedepends = python2-lxml
-	makedepends = python2-sphinx
-	depends = python2
-	depends = krb5
-	depends = python2-distribute
-	depends = python-kobo
-	depends = python2-krbv
-	depends = python2-lxml
-	depends = python2-sphinx
-	source = http://beaker-project.org/releases/beaker-0.9.1.tar.gz
-	source = arch-python2.patch
-	sha1sums = cca0d7449551c75f070d298224c9a51a1692ce30
-	sha1sums = 2ebc72e1c325714133b69e55ca0d49c9f22b0a2f
+	depends = alsa-lib
+	depends = atk
+	depends = at-spi2-atk
+	depends = cairo
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glibc
+	depends = gtk3
+	depends = libcups
+	depends = libsodium
+	depends = libx11
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxcursor
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxi
+	depends = libxrandr
+	depends = libxrender
+	depends = libxss
+	depends = libxtst
+	depends = nodejs
+	depends = nspr
+	depends = nss
+	depends = pango
+	depends = python
+	source = beaker-0.8.8.tar.gz::https://github.com/beakerbrowser/beaker/archive/0.8.8.tar.gz
+	source = beaker.desktop
+	sha512sums = 6f18506344121eb83b15315aa28650732b90278e8bda1293a15117a198a79b2f3628b1e887cb3fa889a0ce1a2a123f605373047c4784adfe1d64c8696b45fbbe
+	sha512sums = 4b61e8a4830fdac99afe2a04885fdd7c64415e32bf0bcb990ad81a7928ff7185a09ef43e827a159410302a2aa536b96a90de9fe29236341882bd464492214cca
 
 pkgname = beaker
 
diff --git a/PKGBUILD b/PKGBUILD
index 8dd9a43df25e..401f67666283 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,39 @@
-# PKGBUILD created by: Gris Ge <cnfourt@gmail.com>
-# PKGBUILD maintained by: Wang Chao <wangchao19890207@gmail.com>
-set -x
-pkgname="beaker"
-pkgver="0.9.1"
-pkgrel="1"
-pkgdesc="Common files for beaker and client tools for beaker job maintenance."
-arch=('i686' 'x86_64')
-url=("https://fedorahosted.org/beaker")
-license=('GPLv2')
-depends=('python2' 'krb5' 'python2-distribute' 'python-kobo' 'python2-krbv' 'python2-lxml' 'python2-sphinx')
-makedepends=('python2' 'docutils' 'python2-distribute' 'python-kobo' 'python2-krbv' 'python2-lxml' 'python2-sphinx')
+# Maintainer: Jean Lucas <jean@4ray.co>
 
-source=("http://beaker-project.org/releases/beaker-$pkgver.tar.gz"
-        "arch-python2.patch")
-
-sha1sums=('cca0d7449551c75f070d298224c9a51a1692ce30'
-'2ebc72e1c325714133b69e55ca0d49c9f22b0a2f')
+pkgname=beaker
+pkgver=0.8.8
+pkgrel=1
+pkgdesc='Experimental peer-to-peer web browser'
+arch=(i686 x86_64)
+url=https://beakerbrowser.com
+license=(MIT)
+depends=(alsa-lib atk at-spi2-atk cairo gcc-libs gdk-pixbuf2 glibc gtk3 libcups libsodium libx11 libxcb libxcomposite libxcursor libxdamage libxext libxfixes libxi libxrandr libxrender libxss libxtst nodejs nspr nss pango python)
+makedepends=(npm git python2)
+source=(beaker-$pkgver.tar.gz::https://github.com/beakerbrowser/beaker/archive/$pkgver.tar.gz
+        beaker.desktop)
+sha512sums=('6f18506344121eb83b15315aa28650732b90278e8bda1293a15117a198a79b2f3628b1e887cb3fa889a0ce1a2a123f605373047c4784adfe1d64c8696b45fbbe'
+            '4b61e8a4830fdac99afe2a04885fdd7c64415e32bf0bcb990ad81a7928ff7185a09ef43e827a159410302a2aa536b96a90de9fe29236341882bd464492214cca')
 
 build() {
-	pwd
-    #cd ${srcdir}/${pkgname}-${pkgver}
-
-	patch -p0 -i arch-python2.patch
-	make -C $pkgname-$pkgver clean || return $?
-	PY_PREFIX="/usr" DESTDIR=${pkgdir} make -C $pkgname-$pkgver || return $?
+  cd beaker-$pkgver
+  npm i
+  npm run rebuild
+  npx electron-builder --dir
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	PY_PREFIX="/usr" DESTDIR=${pkgdir} make install || return $?
+  install -Dm 644 beaker.desktop -t "$pkgdir"/usr/share/applications
+
+  cd beaker-$pkgver
+
+  mkdir "$pkgdir"/usr/{lib,bin}
+  cp -a dist/linux-unpacked "$pkgdir"/usr/lib/beaker
+  ln -s /usr/lib/beaker/beaker-browser "$pkgdir"/usr/bin/beaker
+
+  for i in 16 24 32 48 64 96 128 256 512 1024; do
+    install -Dm 644 build/icons/${i}x${i}.png \
+      "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/beaker.png
+  done
+
+  install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/beaker
 }
diff --git a/arch-python2.patch b/arch-python2.patch
deleted file mode 100644
index cb43bd603771..000000000000
--- a/arch-python2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -uBr beaker-0.9.1/Client/Makefile beaker-0.9.1.new/Client/Makefile
---- beaker-0.9.1/Client/Makefile	2012-07-13 15:41:18.000000000 +0800
-+++ beaker-0.9.1.new/Client/Makefile	2012-07-23 13:28:25.391191027 +0800
-@@ -12,7 +12,7 @@
- .PHONY: build
- build: $(_SETUP_PY)
- 	env PYTHONPATH=../Common$${PYTHONPATH:+:$$PYTHONPATH} \
--	    python $(SETUP_PY) build \
-+	    python2 $(SETUP_PY) build \
- 	    | tee build.out
- 	@if grep -q ImportError build.out ; then \
- 	    echo "ImportErrors in build output, did Sphinx autodoc fail?" ; \
-
-diff -uBr beaker-0.9.1/py_rules.mk beaker-0.9.1.new/py_rules.mk
---- beaker-0.9.1/py_rules.mk	2012-07-13 15:41:18.000000000 +0800
-+++ beaker-0.9.1.new/py_rules.mk	2012-07-23 13:27:25.217793917 +0800
-@@ -24,16 +24,16 @@
- 	sed -e 's/@VERSION@/$(PKGVERSION)/g' < $< > $@
- 
- py-build-ext:	$(_SETUP_PY) $(PY_SOURCES)
--	python $(SETUP_PY) build_ext -i
-+	python2 $(SETUP_PY) build_ext -i
- 
- py-build:   $(_SETUP_PY) $(PY_SOURCES)
--	python $(SETUP_PY) build
-+	python2 $(SETUP_PY) build
- 
- py-install:	$(_SETUP_PY)
--	python $(SETUP_PY) install -O1 --skip-build --root $(DESTDIR)
-+	python2 $(SETUP_PY) install -O1 --skip-build --root $(DESTDIR)
- 
- py-clean:	$(_SETUP_PY)
--	python $(SETUP_PY) clean; \
-+	python2 $(SETUP_PY) clean; \
- 	rm -f $(SETUP_PY); \
- 	rm -rf build
- 
diff --git a/beaker.desktop b/beaker.desktop
new file mode 100644
index 000000000000..cd7bdddd6eec
--- /dev/null
+++ b/beaker.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Beaker
+Comment=Experimental peer-to-peer web browser
+Exec=beaker
+Icon=beaker
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/dat;video/webm;application/x-xpinstall;
+Terminal=false