Move package from [community]

3 files changed, 67 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba35b6779dfd..5da10843752a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,19 @@
 pkgbase = sugar-activity-read
-	pkgdesc = Sugar book reader
-	pkgver = 116
-	pkgrel = 1
-	url = http://www.sugarlabs.org/
+	pkgdesc = Sugar activity to read books
+	pkgver = 118
+	pkgrel = 2
+	url = https://wiki.sugarlabs.org/go/Activities/Read
 	arch = any
-	groups = fructose
+	groups = sugar-fructose
 	license = GPL
-	depends = sugar
-	source = http://download.sugarlabs.org/sources/sucrose/fructose/Read/Read-116.tar.bz2
-	md5sums = bad023b3ebe8049fba3b4ef611a5a919
+	depends = evince
+	depends = python2-beautifulsoup4
+	depends = sugar-toolkit-gtk3
+	depends = webkitgtk
+	source = https://download.sugarlabs.org/sources/sucrose/fructose/Read/Read-118.tar.bz2
+	source = bs4-port.patch
+	sha256sums = 652c66a08c0f6b98e25c1e4d51ac7caffd4a2beefae8c3fd1209e8a432ec0052
+	sha256sums = dab39eb8658c850a684856a698934791e79e8e68b20132a462583da3f12c1d1c
 
 pkgname = sugar-activity-read
 
diff --git a/PKGBUILD b/PKGBUILD
index 437de5604665..62a3cddce1c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,30 @@
-# Contributor: Cilyan Olowen <gaknar@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=sugar-activity-read
-_realname=Read
-pkgver=116
-pkgrel=1
-pkgdesc="Sugar book reader"
+_pkgname=Read
+pkgver=118
+pkgrel=2
+pkgdesc="Sugar activity to read books"
 arch=('any')
-url="http://www.sugarlabs.org/"
+url="https://wiki.sugarlabs.org/go/Activities/Read"
 license=('GPL')
-groups=('fructose')
-depends=('sugar')
-source=(http://download.sugarlabs.org/sources/sucrose/fructose/${_realname}/${_realname}-$pkgver.tar.bz2)
-md5sums=('bad023b3ebe8049fba3b4ef611a5a919')
+groups=('sugar-fructose')
+depends=('evince' 'python2-beautifulsoup4' 'sugar-toolkit-gtk3' 'webkitgtk')
+source=(https://download.sugarlabs.org/sources/sucrose/fructose/$_pkgname/$_pkgname-$pkgver.tar.bz2
+        bs4-port.patch)
+sha256sums=('652c66a08c0f6b98e25c1e4d51ac7caffd4a2beefae8c3fd1209e8a432ec0052'
+            'dab39eb8658c850a684856a698934791e79e8e68b20132a462583da3f12c1d1c')
 
-package() {
-  cd "$srcdir/${_realname}-$pkgver"
+prepare() {
+  cd $_pkgname-$pkgver
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' readdialog.py setup.py
 
-  python2 setup.py install --prefix="$pkgdir/usr" || return 1
+  # Port to Beautiful Soup 4
+  patch -Np1 -i ../bs4-port.patch
 }
 
+package() {
+  cd $_pkgname-$pkgver
+  python2 setup.py install --prefix "$pkgdir/usr"
+  rm -r "$pkgdir"/usr/share/applications
+}
diff --git a/bs4-port.patch b/bs4-port.patch
new file mode 100644
index 000000000000..ffc8d95eb689
--- /dev/null
+++ b/bs4-port.patch
@@ -0,0 +1,32 @@
+From fb84b57f4300b32be2c8d96610e70efaf3c1ddf8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor@gmail.com>
+Date: Sat, 24 Jun 2017 23:00:56 +0200
+Subject: [PATCH] Port to Beautiful Soup 4
+
+It's a replacement for Beautiful Soup 3, which has no further development.
+---
+ epubview/jobs.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/epubview/jobs.py b/epubview/jobs.py
+index 152455f..a877c47 100644
+--- a/epubview/jobs.py
++++ b/epubview/jobs.py
+@@ -21,7 +21,7 @@
+ import widgets
+ import math
+ import os.path
+-import BeautifulSoup
++import bs4
+ 
+ import threading
+ 
+@@ -62,7 +62,7 @@ def _start_search(self):
+         return False
+ 
+     def _searchfile(self, fileobj):
+-        soup = BeautifulSoup.BeautifulSoup(fileobj)
++        soup = bs4.BeautifulSoup(fileobj)
+         body = soup.find('body')
+         tags = body.findChildren(True)
+         for tag in tags: