[arch-commits] Commit in subdownloader/trunk (PKGBUILD follow-download-links.patch)
David Runge
dvzrv at archlinux.org
Wed Mar 7 17:00:01 UTC 2018
Date: Wednesday, March 7, 2018 @ 17:00:00
Author: dvzrv
Revision: 304072
upgpkg: subdownloader 2.1.0rc3-1
Upgrading to 2.1.0rc3 (from new upstream).
Applying tests, installing files not taken care of by setuptools and fixing entry point check.
Modified:
subdownloader/trunk/PKGBUILD
Deleted:
subdownloader/trunk/follow-download-links.patch
-----------------------------+
PKGBUILD | 68 ++++++++++++++++++++----------------------
follow-download-links.patch | 53 --------------------------------
2 files changed, 33 insertions(+), 88 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-07 16:22:33 UTC (rev 304071)
+++ PKGBUILD 2018-03-07 17:00:00 UTC (rev 304072)
@@ -1,63 +1,61 @@
# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Ray Rashif <schiv at archlinux.org>
# Contributor: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
# Contributor: Thomas Jost <thomas.jost at gmail.com>
pkgname=subdownloader
-pkgver=2.0.18
-pkgrel=6
+pkgver=2.1.0rc3
+pkgrel=1
pkgdesc="Automatic download/upload of subtitles using fast hashing"
arch=('any')
-url="http://www.subdownloader.net/"
+url="https://github.com/subdownloader/subdownloader"
license=('GPL3')
-depends=('python2-pyqt4')
-source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz"
- "follow-download-links.patch")
-sha512sums=('ecddf606ce374af43fff39c225ee896af4d8bd2384a2f300dcbb4b443377807edd5233a0531e95d338b0f9c84a274b3afd4109d9216510a5a4bc8fa17485b999'
- '09a03b7b06813f887e18b6774fc2d5f1d477b88fe98785fd03d85bcd33b4aedc6ee1cf233e8af7dd3ca7a524ca14e3a1f8d5e7163e803b0f534023f9b5ded5e9')
+depends=('python-argcomplete' 'python-argparse' 'python-commonmark' 'python-langdetect' 'python-progressbar' 'python-pyqt5' 'python-pymediainfo' 'python-sip')
+makedepends=('python-setuptools' 'python-sphinx')
+checkdepends=('python-pytest')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('767962c8b1f9a7cfc4a8e44be61b2070b56f18572a6e156e9f19d4116b3531ec05a8170f66fa558f19fbd496e8d5d808f1f1c6396fa61405f570f6e099e0c80e')
-prepare(){
+build(){
cd "${pkgname}-${pkgver}"
+ python setup.py build
+ python setup.py build_sphinx
+}
- # See https://bugs.archlinux.org/task/48402
- patch -Np0 -i "$srcdir/follow-download-links.patch"
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' \
- -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' \
- -i "${file}"
- done
-
- # remove empty, useless dir
- rmdir modules/mmpython/doc
+check() {
+ cd "${pkgname}-${pkgver}"
+ export PYTHONPATH="${srcdir}/${pkgname}-${pkgver}/build/lib/":${PYTHONPATH}
+ python setup.py test
}
package() {
cd "${pkgname}-${pkgver}"
+ python setup.py install --skip-build \
+ --optimize=1 \
+ --prefix=/usr \
+ --root="${pkgdir}"
- # prepare dirs
- install -d "$pkgdir/usr/share/$pkgname" \
- "$pkgdir/usr/bin" \
- "$pkgdir/usr/share/man/man1/"
-
# man page
- install -vDm644 ${pkgname}.1 "$pkgdir/usr/share/man/man1/${pkgname}.1"
+ install -vDm644 "build/sphinx/man/${pkgname}.1" \
+ "${pkgdir}/usr/share/man/man1/${pkgname}.1"
# freedesktop.org
install -vDm644 "${pkgname}.desktop" \
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -vDm644 "gui/images/${pkgname}.png" \
+ install -vDm644 "scripts/gui/rc/images/${pkgname}.png" \
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- # runtime and executables
- cp -av {FileManagement,gui,languages,locale,modules} \
- "${pkgdir}/usr/share/${pkgname}/"
- install -vDm 755 run.py "${pkgdir}/usr/share/${pkgname}/run.py"
- ln -s "/usr/share/${pkgname}/run.py" \
- "${pkgdir}/usr/bin/${pkgname}"
+ # docs
+ install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+ -vDm644 {ChangeLog,README.md} \
+
+ # remove tests folder
+ rm -r "${pkgdir}/usr/lib/python3.6/site-packages/tests"
+ # remove broken PyQt5 detection: https://github.com/subdownloader/subdownloader/issues/25
+ sed -e '/PyQt5/d' \
+ -i "${pkgdir}/usr/lib/python3.6/site-packages/SubDownloader-2.1.0rc3-py3.6.egg-info/requires.txt"
}
# vim:set ts=2 sw=2 et:
Deleted: follow-download-links.patch
===================================================================
--- follow-download-links.patch 2018-03-07 16:22:33 UTC (rev 304071)
+++ follow-download-links.patch 2018-03-07 17:00:00 UTC (rev 304072)
@@ -1,53 +0,0 @@
-------------------------------------------------------------
-revno: 557
-committer: Christos Trochalakis <yatiohi at ideopolis.gr>
-branch nick: subdownloader
-timestamp: Sat 2016-01-02 20:14:12 +0200
-message:
- Follow opensubtitles.org download link
-
- Download links were constructed by subdownloader instead of using the
- download URL from the API.
-
- Closes #1528605
-diff:
-=== modified file 'gui/main.py'
---- gui/main.py 2012-11-04 14:45:22 +0000
-+++ gui/main.py 2016-01-02 18:14:12 +0000
-@@ -1140,7 +1140,7 @@
- if not skip_all:
- log.debug("Downloading subtitle '%s'" % destinationPath)
- #print {sub.getIdFileOnline():destinationPath}
-- osHttpRequests.download('http://www.opensubtitles.org/en/download/file/%s.gz' %sub.getIdFileOnline(), destinationPath)
-+ osHttpRequests.download(sub.getDownloadLink(), destinationPath)
- #if self.OSDBServer.DownloadSubtitles({sub.getIdFileOnline():destinationPath}):
- #success_downloaded += 1
- #else:
-
-=== modified file 'modules/SDService.py'
---- modules/SDService.py 2011-05-30 02:16:51 +0000
-+++ modules/SDService.py 2016-01-02 18:14:12 +0000
-@@ -490,6 +490,7 @@
- #sub.setLanguageName(i["LanguageName"])
- sub.setRating(i["SubRating"])
- sub.setUploader(i["UserNickName"])
-+ sub.setDownloadLink(i["SubDownloadLink"])
- sub.setVideo(video)
-
- self.log.debug(" [%s] - %s"% (sub.getLanguage(), sub.getFileName()))
-
-=== modified file 'modules/subtitlefile.py'
---- modules/subtitlefile.py 2011-05-30 02:16:51 +0000
-+++ modules/subtitlefile.py 2016-01-02 18:14:12 +0000
-@@ -139,6 +139,12 @@
- def getRating(self):
- return self.rating
-
-+ def setDownloadLink(self, link):
-+ self.download_link = link
-+
-+ def getDownloadLink(self):
-+ return self.download_link
-+
- def setExtraInfo(self, info, data):
- self._extraInfo[info] = data
More information about the arch-commits
mailing list