Date: Saturday, June 24, 2017 @ 21:12:13 Author: bgyorgy Revision: 240854
archrelease: copy trunk to community-any Added: sugar-activity-read/repos/community-any/PKGBUILD (from rev 240853, sugar-activity-read/trunk/PKGBUILD) sugar-activity-read/repos/community-any/bs4-port.patch (from rev 240853, sugar-activity-read/trunk/bs4-port.patch) Deleted: sugar-activity-read/repos/community-any/PKGBUILD ----------------+ PKGBUILD | 57 +++++++++++++++++++++++++++++-------------------------- bs4-port.patch | 32 ++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 26 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-06-24 21:12:06 UTC (rev 240853) +++ PKGBUILD 2017-06-24 21:12:13 UTC (rev 240854) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=sugar-activity-read -_pkgname=Read -pkgver=118 -pkgrel=1 -pkgdesc="Sugar activity to read books" -arch=('any') -url="https://wiki.sugarlabs.org/go/Activities/Read" -license=('GPL') -groups=('sugar-fructose') -depends=('evince' 'python2-beautifulsoup3' 'sugar-toolkit-gtk3') -source=(https://download.sugarlabs.org/sources/sucrose/fructose/$_pkgname/$_pkgname-$pkgver.tar.bz2) -sha256sums=('652c66a08c0f6b98e25c1e4d51ac7caffd4a2beefae8c3fd1209e8a432ec0052') - -prepare() { - cd $_pkgname-$pkgver - sed -i 's@^#!.*python$@#!/usr/bin/python2@' readdialog.py setup.py -} - -package() { - cd $_pkgname-$pkgver - python2 setup.py install --prefix "$pkgdir/usr" - rm -r "$pkgdir"/usr/share/applications -} Copied: sugar-activity-read/repos/community-any/PKGBUILD (from rev 240853, sugar-activity-read/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-06-24 21:12:13 UTC (rev 240854) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=sugar-activity-read +_pkgname=Read +pkgver=118 +pkgrel=2 +pkgdesc="Sugar activity to read books" +arch=('any') +url="https://wiki.sugarlabs.org/go/Activities/Read" +license=('GPL') +groups=('sugar-fructose') +depends=('evince' 'python2-beautifulsoup4' 'sugar-toolkit-gtk3') +source=(https://download.sugarlabs.org/sources/sucrose/fructose/$_pkgname/$_pkgname-$pkgver.tar.bz2 + bs4-port.patch) +sha256sums=('652c66a08c0f6b98e25c1e4d51ac7caffd4a2beefae8c3fd1209e8a432ec0052' + 'dab39eb8658c850a684856a698934791e79e8e68b20132a462583da3f12c1d1c') + +prepare() { + cd $_pkgname-$pkgver + sed -i 's@^#!.*python$@#!/usr/bin/python2@' readdialog.py setup.py + + # 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 +} Copied: sugar-activity-read/repos/community-any/bs4-port.patch (from rev 240853, sugar-activity-read/trunk/bs4-port.patch) =================================================================== --- bs4-port.patch (rev 0) +++ bs4-port.patch 2017-06-24 21:12:13 UTC (rev 240854) @@ -0,0 +1,32 @@ +From fb84b57f4300b32be2c8d96610e70efaf3c1ddf8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballog...@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: