[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2020-11-12 Thread Felix Yan via arch-commits 
Date: Thursday, November 12, 2020 @ 17:07:25
  Author: felixonmars
Revision: 752262

upgpkg: subdownloader 2.1.0-4: Python 3.9 rebuild

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 17:07:13 UTC (rev 752261)
+++ PKGBUILD2020-11-12 17:07:25 UTC (rev 752262)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2019-11-04 Thread Felix Yan via arch-commits 
Date: Monday, November 4, 2019 @ 21:53:12
  Author: felixonmars
Revision: 524136

Python 3.8 rebuild

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 21:50:20 UTC (rev 524135)
+++ PKGBUILD2019-11-04 21:53:12 UTC (rev 524136)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2019-10-24 Thread David Runge via arch-commits 
Date: Thursday, October 24, 2019 @ 20:25:52
  Author: dvzrv
Revision: 518829

upgpkg: subdownloader 2.1.0-2

Adding python-sphinx-argparse to makedepends to have better documentation and 
not hack the documentation build.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-24 20:22:46 UTC (rev 518828)
+++ PKGBUILD2019-10-24 20:25:52 UTC (rev 518829)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;
@@ -14,18 +14,11 @@
 depends=('desktop-file-utils' 'python-argcomplete' 'python-argparse'
 'python-commonmark' 'python-langdetect' 'python-progressbar' 'python-pyqt5'
 'python-pymediainfo' 'python-setuptools' 'python-sip')
-makedepends=('python-sphinx')
+makedepends=('python-sphinx' 'python-sphinx-argparse')
 checkdepends=('python-pytest')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz;)
 
sha512sums=('c61e5eb5c9f1cb452b42a2643e67d9c82550af3dd36940e2d7f4afb8229f8d394a0eafca662f5446c13230b6541dec25e6d33c486a3324d4a5e3c2d7b3a1faa8')
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # remove extension, failing sphinx build:
-  # https://github.com/subdownloader/subdownloader/issues/44
-  sed -e '/sphinxarg.ext/d' -i doc/conf.py
-}
-
 build(){
   cd "${pkgname}-${pkgver}"
   python setup.py build

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2019-10-18 Thread David Runge via arch-commits 
Date: Friday, October 18, 2019 @ 13:19:32
  Author: dvzrv
Revision: 516855

upgpkg: subdownloader 2.1.0-1

Updating maintainer string.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 13:19:07 UTC (rev 516854)
+++ PKGBUILD2019-10-18 13:19:32 UTC (rev 516855)
@@ -1,4 +1,4 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 # Contributor: Ray Rashif 
 # Contributor: Andrea Scarpino 
 # Contributor: Geoffroy Carrier

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2019-10-18 Thread David Runge via arch-commits 
Date: Friday, October 18, 2019 @ 08:04:10
  Author: dvzrv
Revision: 516654

upgpkg: subdownloader 2.1.0-1

Upgrading to 2.1.0. Fixing a broken extension import for the documentation 
build.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 06:42:13 UTC (rev 516653)
+++ PKGBUILD2019-10-18 08:04:10 UTC (rev 516654)
@@ -5,25 +5,25 @@
 # Contributor: Thomas Jost 
 
 pkgname=subdownloader
-pkgver=2.1.0rc4
-pkgrel=3
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;
 license=('GPL3')
-depends=('python-argcomplete' 'python-argparse' 'python-commonmark'
-'python-langdetect' 'python-progressbar' 'python-pyqt5'  'python-pymediainfo'
-'python-setuptools' 'python-sip')
+depends=('desktop-file-utils' 'python-argcomplete' 'python-argparse'
+'python-commonmark' 'python-langdetect' 'python-progressbar' 'python-pyqt5'
+'python-pymediainfo' 'python-setuptools' 'python-sip')
 makedepends=('python-sphinx')
 checkdepends=('python-pytest')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz;)
-sha512sums=('99946402622db535c5261324b2b39986ab0b9e433a459f3b9100ec2fe3ddf4159de591ac472de7ea438a0a2ecfdd60fd88c2a1c3e827c7e642be7f2dbde5ac65')
+sha512sums=('c61e5eb5c9f1cb452b42a2643e67d9c82550af3dd36940e2d7f4afb8229f8d394a0eafca662f5446c13230b6541dec25e6d33c486a3324d4a5e3c2d7b3a1faa8')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-
-  # remove broken PyQt5 detection: 
https://github.com/subdownloader/subdownloader/issues/25
-  sed -i '/PyQt5/d' setup.py
+  # remove extension, failing sphinx build:
+  # https://github.com/subdownloader/subdownloader/issues/44
+  sed -e '/sphinxarg.ext/d' -i doc/conf.py
 }
 
 build(){
@@ -42,20 +42,15 @@
   python setup.py install --skip-build \
 --optimize=1 \
 --root="${pkgdir}"
-
   # man page
   install -vDm 644 "build/sphinx/man/${pkgname}.1" \
 "${pkgdir}/usr/share/man/man1/${pkgname}.1"
-
   # freedesktop.org
   install -vDm 644 "${pkgname}.desktop" \
 "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -vDm 644 "scripts/gui/rc/images/${pkgname}.png" \
 "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-
   # docs
   install -t "${pkgdir}/usr/share/doc/${pkgname}" \
 -vDm 644 {ChangeLog,README.md}
 }
-
-# vim:set ts=2 sw=2 et:

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2018-07-23 Thread Eli Schwartz via arch-commits 
Date: Tuesday, July 24, 2018 @ 05:03:51
  Author: eschwartz
Revision: 363237

upgpkg: subdownloader 2.1.0rc4-3

python 3.7 rebuild

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-24 01:38:04 UTC (rev 363236)
+++ PKGBUILD2018-07-24 05:03:51 UTC (rev 363237)
@@ -7,7 +7,7 @@
 
 pkgname=subdownloader
 pkgver=2.1.0rc4
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;
@@ -20,6 +20,13 @@
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz;)
 
sha512sums=('99946402622db535c5261324b2b39986ab0b9e433a459f3b9100ec2fe3ddf4159de591ac472de7ea438a0a2ecfdd60fd88c2a1c3e827c7e642be7f2dbde5ac65')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+  # remove broken PyQt5 detection: 
https://github.com/subdownloader/subdownloader/issues/25
+  sed -i '/PyQt5/d' setup.py
+}
+
 build(){
   cd "${pkgname}-${pkgver}"
   python setup.py build
@@ -35,7 +42,6 @@
   cd "${pkgname}-${pkgver}"
   python setup.py install --skip-build \
 --optimize=1 \
---prefix=/usr \
 --root="${pkgdir}"
 
   # man page
@@ -50,11 +56,7 @@
 
   # docs
   install -t "${pkgdir}/usr/share/doc/${pkgname}" \
--vDm 644 {ChangeLog,README.md} \
-
-  # remove broken PyQt5 detection: 
https://github.com/subdownloader/subdownloader/issues/25
-  sed -e '/PyQt5/d' \
--i 
"${pkgdir}/usr/lib/python3.6/site-packages/SubDownloader-${pkgver}-py3.6.egg-info/requires.txt"
+-vDm 644 {ChangeLog,README.md}
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2018-07-19 Thread David Runge via arch-commits 
Date: Thursday, July 19, 2018 @ 19:28:47
  Author: dvzrv
Revision: 362445

upgpkg: subdownloader 2.1.0rc4-2

Fixing failing tests. Minor fixes.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-19 19:26:02 UTC (rev 362444)
+++ PKGBUILD2018-07-19 19:28:47 UTC (rev 362445)
@@ -7,12 +7,14 @@
 
 pkgname=subdownloader
 pkgver=2.1.0rc4
-pkgrel=1
+pkgrel=2
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;
 license=('GPL3')
-depends=('python-argcomplete' 'python-argparse' 'python-commonmark' 
'python-langdetect' 'python-progressbar' 'python-pyqt5'  'python-pymediainfo' 
'python-setuptools' 'python-sip')
+depends=('python-argcomplete' 'python-argparse' 'python-commonmark'
+'python-langdetect' 'python-progressbar' 'python-pyqt5'  'python-pymediainfo'
+'python-setuptools' 'python-sip')
 makedepends=('python-sphinx')
 checkdepends=('python-pytest')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz;)
@@ -26,8 +28,7 @@
 
 check() {
   cd "${pkgname}-${pkgver}"
-  export PYTHONPATH="${srcdir}/${pkgname}-${pkgver}/build/lib/":${PYTHONPATH}
-  python setup.py test
+  py.test
 }
 
 package() {
@@ -38,18 +39,18 @@
 --root="${pkgdir}"
 
   # man page
-  install -vDm644 "build/sphinx/man/${pkgname}.1" \
+  install -vDm 644 "build/sphinx/man/${pkgname}.1" \
 "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 
   # freedesktop.org
-  install -vDm644 "${pkgname}.desktop" \
+  install -vDm 644 "${pkgname}.desktop" \
 "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -vDm644 "scripts/gui/rc/images/${pkgname}.png" \
+  install -vDm 644 "scripts/gui/rc/images/${pkgname}.png" \
 "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 
   # docs
   install -t "${pkgdir}/usr/share/doc/${pkgname}" \
--vDm644 {ChangeLog,README.md} \
+-vDm 644 {ChangeLog,README.md} \
 
   # remove broken PyQt5 detection: 
https://github.com/subdownloader/subdownloader/issues/25
   sed -e '/PyQt5/d' \

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2018-03-28 Thread David Runge via arch-commits 
Date: Wednesday, March 28, 2018 @ 19:14:28
  Author: dvzrv
Revision: 313173

upgpkg: subdownloader 2.1.0rc4-1

Upgrading to 2.1.0rc4. Removing unneeded removal of tests. Making entry point 
modification follow versioning.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 18:40:50 UTC (rev 313172)
+++ PKGBUILD2018-03-28 19:14:28 UTC (rev 313173)
@@ -6,17 +6,17 @@
 # Contributor: Thomas Jost 
 
 pkgname=subdownloader
-pkgver=2.1.0rc3
+pkgver=2.1.0rc4
 pkgrel=1
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="https://github.com/subdownloader/subdownloader;
 license=('GPL3')
-depends=('python-argcomplete' 'python-argparse' 'python-commonmark' 
'python-langdetect' 'python-progressbar' 'python-pyqt5'  'python-pymediainfo' 
'python-sip')
-makedepends=('python-setuptools' 'python-sphinx')
+depends=('python-argcomplete' 'python-argparse' 'python-commonmark' 
'python-langdetect' 'python-progressbar' 'python-pyqt5'  'python-pymediainfo' 
'python-setuptools' 'python-sip')
+makedepends=('python-sphinx')
 checkdepends=('python-pytest')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz;)
-sha512sums=('767962c8b1f9a7cfc4a8e44be61b2070b56f18572a6e156e9f19d4116b3531ec05a8170f66fa558f19fbd496e8d5d808f1f1c6396fa61405f570f6e099e0c80e')
+sha512sums=('99946402622db535c5261324b2b39986ab0b9e433a459f3b9100ec2fe3ddf4159de591ac472de7ea438a0a2ecfdd60fd88c2a1c3e827c7e642be7f2dbde5ac65')
 
 build(){
   cd "${pkgname}-${pkgver}"
@@ -51,11 +51,9 @@
   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"
+-i 
"${pkgdir}/usr/lib/python3.6/site-packages/SubDownloader-${pkgver}-py3.6.egg-info/requires.txt"
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in subdownloader/trunk (PKGBUILD follow-download-links.patch)

2018-03-07 Thread David Runge via arch-commits 
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
===
--- PKGBUILD2018-03-07 16:22:33 UTC (rev 304071)
+++ PKGBUILD2018-03-07 17:00:00 UTC (rev 304072)
@@ -1,63 +1,61 @@
 # $Id$
-# Maintainer: Ray Rashif 
 # Maintainer: David Runge 
+# Contributor: Ray Rashif 
 # Contributor: Andrea Scarpino 
 # Contributor: Geoffroy Carrier 
 # Contributor: Thomas Jost 
 
 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 
-branch nick: subdownloader
-timestamp: Sat 2016-01-02 20:14:12 +0200
-message:
-  Follow opensubtitles.org download link
-  
-  Download links were

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2018-01-27 Thread David Runge via arch-commits 
Date: Saturday, January 27, 2018 @ 10:54:46
  Author: dvzrv
Revision: 287406

upgpkg: subdownloader 2.0.18-6

Updating maintainer. Removing unneeded options and makedepends.
Moving patching and modifications to prepare(). Switching to sha512sums. 
Switching to https for source. Cleaning up package().

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-27 10:53:01 UTC (rev 287405)
+++ PKGBUILD2018-01-27 10:54:46 UTC (rev 287406)
@@ -7,7 +7,7 @@
 
 pkgname=subdownloader
 pkgver=2.0.18
-pkgrel=5
+pkgrel=6
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="http://www.subdownloader.net/;

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2018-01-27 Thread David Runge via arch-commits 
Date: Saturday, January 27, 2018 @ 10:52:52
  Author: dvzrv
Revision: 287404

upgpkg: subdownloader 2.0.18-5

Updating maintainer. Removing unneeded options and makedepends.
Moving patching and modifications to prepare(). Switching to sha512sums. 
Switching to https for source. Cleaning up package().

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   50 +++---
 1 file changed, 23 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-27 09:42:39 UTC (rev 287403)
+++ PKGBUILD2018-01-27 10:52:52 UTC (rev 287404)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Ray Rashif 
+# Maintainer: David Runge 
 # Contributor: Andrea Scarpino 
 # Contributor: Geoffroy Carrier 
 # Contributor: Thomas Jost 
@@ -12,15 +13,13 @@
 url="http://www.subdownloader.net/;
 license=('GPL3')
 depends=('python2-pyqt4')
-makedepends=('icu')
-options=('!emptydirs')
-source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;
+source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz;
 "follow-download-links.patch")
-md5sums=('11dbc455f542b68e96e2cc539deb3f8f'
- 'ae4eee141243cb5a20eeaaa49abcf75b')
+sha512sums=('ecddf606ce374af43fff39c225ee896af4d8bd2384a2f300dcbb4b443377807edd5233a0531e95d338b0f9c84a274b3afd4109d9216510a5a4bc8fa17485b999'
+
'09a03b7b06813f887e18b6774fc2d5f1d477b88fe98785fd03d85bcd33b4aedc6ee1cf233e8af7dd3ca7a524ca14e3a1f8d5e7163e803b0f534023f9b5ded5e9')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare(){
+  cd "${pkgname}-${pkgver}"
 
   # See https://bugs.archlinux.org/task/48402
   patch -Np0 -i "$srcdir/follow-download-links.patch"
@@ -27,14 +26,17 @@
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
-sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+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
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${pkgname}-${pkgver}"
 
   # prepare dirs
   install -d "$pkgdir/usr/share/$pkgname" \
@@ -41,27 +43,21 @@
 "$pkgdir/usr/bin" \
 "$pkgdir/usr/share/man/man1/"
 
-  # manuals
-  gzip subdownloader.1
-  install -D subdownloader.1.gz "$pkgdir/usr/share/man/man1/"
+  # man page
+  install -vDm644 ${pkgname}.1 "$pkgdir/usr/share/man/man1/${pkgname}.1"
 
   # freedesktop.org
-  install -D -m644 subdownloader.desktop \
-"$pkgdir/usr/share/applications/subdownloader.desktop"
-  rm subdownloader.1.gz subdownloader.desktop
+  install -vDm644 "${pkgname}.desktop" \
+"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -vDm644 "gui/images/${pkgname}.png" \
+"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 
   # runtime and executables
-  cp -a * "$pkgdir/usr/share/$pkgname/"
-  chmod 755 "$pkgdir/usr/share/$pkgname/run.py"
-  ln -s "/usr/share/$pkgname/run.py" \
-"$pkgdir/usr/bin/subdownloader"
-
-  install -D -m644 gui/images/subdownloader.png \
-"$pkgdir/usr/share/pixmaps/subdownloader.png"
-
-  # unnecessary directories
-  cd "$pkgdir/usr/share/$pkgname"
-  rm -r distribution
+  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}"
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2017-06-29 Thread Balló György 
Date: Thursday, June 29, 2017 @ 11:08:05
  Author: bgyorgy
Revision: 241566

upgpkg: subdownloader 2.0.18-5

Remove unused dependencies. Metadata support is provided by the internal 
mmpython library.

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-29 10:34:45 UTC (rev 241565)
+++ PKGBUILD2017-06-29 11:08:05 UTC (rev 241566)
@@ -6,12 +6,12 @@
 
 pkgname=subdownloader
 pkgver=2.0.18
-pkgrel=4
+pkgrel=5
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="http://www.subdownloader.net/;
 license=('GPL3')
-depends=('imdbpy' 'kaa-metadata' 'python2-pyqt')
+depends=('python2-pyqt4')
 makedepends=('icu')
 options=('!emptydirs')
 
source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;

[arch-commits] Commit in subdownloader/trunk (PKGBUILD subdownloader.install)

2016-05-20 Thread Antonio Rojas 
Date: Friday, May 20, 2016 @ 21:11:00
  Author: arojas
Revision: 175948

Hooks

Modified:
  subdownloader/trunk/PKGBUILD
Deleted:
  subdownloader/trunk/subdownloader.install

---+
 PKGBUILD  |3 +--
 subdownloader.install |   11 ---
 2 files changed, 1 insertion(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-20 18:40:47 UTC (rev 175947)
+++ PKGBUILD2016-05-20 19:11:00 UTC (rev 175948)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.0.18
-pkgrel=3
+pkgrel=4
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="http://www.subdownloader.net/;
@@ -14,7 +14,6 @@
 depends=('imdbpy' 'kaa-metadata' 'python2-pyqt')
 makedepends=('icu')
 options=('!emptydirs')
-install=$pkgname.install
 
source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;
 "follow-download-links.patch")
 md5sums=('11dbc455f542b68e96e2cc539deb3f8f'

Deleted: subdownloader.install
===
--- subdownloader.install   2016-05-20 18:40:47 UTC (rev 175947)
+++ subdownloader.install   2016-05-20 19:11:00 UTC (rev 175948)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

[arch-commits] Commit in subdownloader/trunk (PKGBUILD follow-download-links.patch)

2016-03-02 Thread Ray Rashif 
Date: Wednesday, March 2, 2016 @ 23:51:43
  Author: schiv
Revision: 164262

upgpkg: subdownloader 2.0.18-3

subdownloader: backport fix for API breakage

Added:
  subdownloader/trunk/follow-download-links.patch
Modified:
  subdownloader/trunk/PKGBUILD

-+
 PKGBUILD|   12 +++--
 follow-download-links.patch |   53 ++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-02 22:28:15 UTC (rev 164261)
+++ PKGBUILD2016-03-02 22:51:43 UTC (rev 164262)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.0.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatic download/upload of subtitles using fast hashing"
 arch=('any')
 url="http://www.subdownloader.net/;
@@ -15,17 +15,23 @@
 makedepends=('icu')
 options=('!emptydirs')
 install=$pkgname.install
-source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;)
-md5sums=('11dbc455f542b68e96e2cc539deb3f8f')
+source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;
+"follow-download-links.patch")
+md5sums=('11dbc455f542b68e96e2cc539deb3f8f'
+ 'ae4eee141243cb5a20eeaaa49abcf75b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # 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 -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
 sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
+
 }
 
 package() {

Added: follow-download-links.patch
===
--- follow-download-links.patch (rev 0)
+++ follow-download-links.patch 2016-03-02 22:51:43 UTC (rev 164262)
@@ -0,0 +1,53 @@
+
+revno: 557
+committer: Christos Trochalakis 
+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.py2012-11-04 14:45:22 +
 gui/main.py2016-01-02 18:14:12 +
+@@ -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 +
 modules/SDService.py   2016-01-02 18:14:12 +
+@@ -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.py2011-05-30 02:16:51 +
 modules/subtitlefile.py2016-01-02 18:14:12 +
+@@ -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

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2014-07-06 Thread Ray Rashif 
Date: Sunday, July 6, 2014 @ 12:44:03
  Author: schiv
Revision: 115162

upgpkg: subdownloader 2.0.18-2

mtree rebuild

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-06 09:29:44 UTC (rev 115161)
+++ PKGBUILD2014-07-06 10:44:03 UTC (rev 115162)
@@ -6,7 +6,7 @@
 
 pkgname=subdownloader
 pkgver=2.0.18
-pkgrel=1
+pkgrel=2
 pkgdesc=Automatic download/upload of subtitles using fast hashing
 arch=('any')
 url=http://www.subdownloader.net/;

[arch-commits] Commit in subdownloader/trunk (PKGBUILD)

2013-02-18 Thread Ray Rashif 
Date: Monday, February 18, 2013 @ 14:25:11
  Author: schiv
Revision: 84402

upgpkg: subdownloader 2.0.18-1

upstream release

Modified:
  subdownloader/trunk/PKGBUILD

--+
 PKGBUILD |   25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 05:16:03 UTC (rev 84401)
+++ PKGBUILD2013-02-18 13:25:11 UTC (rev 84402)
@@ -5,8 +5,7 @@
 # Contributor: Thomas Jost thomas.j...@gmail.com
 
 pkgname=subdownloader
-pkgver=2.0.16_1
-_pkgver=2.0.16-1
+pkgver=2.0.18
 pkgrel=1
 pkgdesc=Automatic download/upload of subtitles using fast hashing
 arch=('any')
@@ -14,33 +13,23 @@
 license=('GPL3')
 depends=('imdbpy' 'kaa-metadata' 'python2-pyqt')
 makedepends=('icu')
+options=('!emptydirs')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/trunk/$_pkgver/+download/${pkgname}_$_pkgver.tar.gz;)
-md5sums=('2c5fee6cc97b42c8f1b9dcee329ec962')
+source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_$pkgver.orig.tar.gz;)
+md5sums=('11dbc455f542b68e96e2cc539deb3f8f')
 
 build() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
 sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
-
-  # something upstream forgot to do? (gives us missing images_rc.py)
-  # see https://bugs.launchpad.net/subdownloader/+bug/1047425
-  if ! test -f gui/images_rc.py; then
-(
-cd gui
-sed -i -e 's/python /python2 /' \
-  -e 's/pyuic4 /python2-pyuic4 /' Makefile
-make
-)
-  fi
 }
 
 package() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
 
   # prepare dirs
   install -d $pkgdir/usr/share/$pkgname \
@@ -67,7 +56,7 @@
 
   # unnecessary directories
   cd $pkgdir/usr/share/$pkgname
-  rm -r debian distribution
+  rm -r distribution
 }
 
 # vim:set ts=2 sw=2 et: