[arch-commits] Commit in deluge/repos/extra-any (3 files)
Jan Steffens
heftig at archlinux.org
Sun Jul 19 09:10:31 UTC 2020
Date: Sunday, July 19, 2020 @ 09:10:30
Author: heftig
Revision: 392271
archrelease: copy trunk to extra-any
Added:
deluge/repos/extra-any/PKGBUILD
(from rev 392269, deluge/trunk/PKGBUILD)
deluge/repos/extra-any/user-agent-override.diff
(from rev 392269, deluge/trunk/user-agent-override.diff)
Deleted:
deluge/repos/extra-any/PKGBUILD
--------------------------+
PKGBUILD | 235 ++++++++++++++++++++++-----------------------
user-agent-override.diff | 13 ++
2 files changed, 133 insertions(+), 115 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-19 09:10:30 UTC (rev 392270)
+++ PKGBUILD 2020-07-19 09:10:30 UTC (rev 392271)
@@ -1,115 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=deluge
-pkgname=(deluge deluge-gtk)
-pkgver=2.0.4.dev38+g23a48dd01
-pkgrel=1
-pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
-url="https://deluge-torrent.org/"
-arch=(any)
-license=(GPL3)
-depends=(
- # Follows DEPENDS.md
- 'python-twisted>=17.1' python-service-identity python-idna
- 'openssl>=1.0.1'
- python-pyopenssl
- 'python-rencode>=1.0.2'
- python-xdg
- python-six
- 'python-zope-interface>=4.4.2'
- python-chardet
- python-setproctitle
- python-pillow
- python-dbus
- python-distro
- 'libtorrent-rasterbar>=1.1.1'
- python-geoip
- python-mako
-)
-makedepends=(
- python-setuptools
- intltool
- gtk3
- python-gobject
- python-cairo
- librsvg
- xdg-utils
- libappindicator-gtk3
- #python-pygame
- libnotify
- git
-)
-_commit=23a48dd01c86ef01cd1d13371de51247ec9a503b # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd deluge
- git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
-}
-
-prepare() {
- cd deluge
-}
-
-build() {
- cd deluge
- python setup.py build
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_deluge() {
- cd deluge
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-
- install -Dt "$pkgdir/usr/lib/systemd/system" \
- -m644 packaging/systemd/*.service
- install -Dt "$pkgdir/usr/lib/systemd/system/deluged.service.d" \
- -m644 packaging/systemd/user.conf
- install -Dt "$pkgdir/usr/lib/systemd/system/deluge-web.service.d" \
- -m644 packaging/systemd/user.conf
-
- echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
- echo 'd /srv/deluge 0770 deluge deluge' |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
- cd "$pkgdir"
-
- _pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1
- _pick gtk usr/share/{appdata,applications,icons,pixmaps}
- _pick gtk usr/lib/python3.8/site-packages/deluge/ui/gtk3
-}
-
-package_deluge-gtk() {
- pkgdesc="GTK UI for Deluge"
- depends=(
- "deluge=$pkgver-$pkgrel"
- gtk3
- librsvg
- python-cairo
- python-gobject
- xdg-utils
- )
- optdepends=(
- 'libappindicator-gtk3: appindicator notifications'
- #'python-pygame: audible notifications'
- 'libnotify: desktop notifications'
- )
- replaces=('deluge<2.0.4.dev23+g2f1c008a2-2')
-
- mv gtk/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: deluge/repos/extra-any/PKGBUILD (from rev 392269, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-19 09:10:30 UTC (rev 392271)
@@ -0,0 +1,120 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=deluge
+pkgname=(deluge deluge-gtk)
+pkgver=2.0.4.dev38+g23a48dd01
+pkgrel=2
+pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
+url="https://deluge-torrent.org/"
+arch=(any)
+license=(GPL3)
+depends=(
+ # Follows DEPENDS.md
+ 'python-twisted>=17.1' python-service-identity python-idna
+ 'openssl>=1.0.1'
+ python-pyopenssl
+ 'python-rencode>=1.0.2'
+ python-xdg
+ python-six
+ 'python-zope-interface>=4.4.2'
+ python-chardet
+ python-setproctitle
+ python-pillow
+ python-dbus
+ python-distro
+ 'libtorrent-rasterbar>=1.1.1'
+ python-geoip
+ python-mako
+)
+makedepends=(
+ python-setuptools
+ intltool
+ gtk3
+ python-gobject
+ python-cairo
+ librsvg
+ xdg-utils
+ libappindicator-gtk3
+ #python-pygame
+ libnotify
+ git
+)
+_commit=23a48dd01c86ef01cd1d13371de51247ec9a503b # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+ user-agent-override.diff)
+sha256sums=('SKIP'
+ 'f5ef4db7f1b78cd20cab91f25c7823f91f4e105639225b37aa4750d0cdd65104')
+
+pkgver() {
+ cd deluge
+ git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
+}
+
+prepare() {
+ cd deluge
+
+ # Pretend to be stable deluge
+ patch -Np1 -i ../user-agent-override.diff
+}
+
+build() {
+ cd deluge
+ python setup.py build
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_deluge() {
+ cd deluge
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
+ install -Dt "$pkgdir/usr/lib/systemd/system" \
+ -m644 packaging/systemd/*.service
+ install -Dt "$pkgdir/usr/lib/systemd/system/deluged.service.d" \
+ -m644 packaging/systemd/user.conf
+ install -Dt "$pkgdir/usr/lib/systemd/system/deluge-web.service.d" \
+ -m644 packaging/systemd/user.conf
+
+ echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+ echo 'd /srv/deluge 0770 deluge deluge' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+
+ cd "$pkgdir"
+
+ _pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1
+ _pick gtk usr/share/{appdata,applications,icons,pixmaps}
+ _pick gtk usr/lib/python3.8/site-packages/deluge/ui/gtk3
+}
+
+package_deluge-gtk() {
+ pkgdesc="GTK UI for Deluge"
+ depends=(
+ "deluge=$pkgver-$pkgrel"
+ gtk3
+ librsvg
+ python-cairo
+ python-gobject
+ xdg-utils
+ )
+ optdepends=(
+ 'libappindicator-gtk3: appindicator notifications'
+ #'python-pygame: audible notifications'
+ 'libnotify: desktop notifications'
+ )
+ replaces=('deluge<2.0.4.dev23+g2f1c008a2-2')
+
+ mv gtk/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
Copied: deluge/repos/extra-any/user-agent-override.diff (from rev 392269, deluge/trunk/user-agent-override.diff)
===================================================================
--- user-agent-override.diff (rev 0)
+++ user-agent-override.diff 2020-07-19 09:10:30 UTC (rev 392271)
@@ -0,0 +1,13 @@
+diff --git i/deluge/core/core.py w/deluge/core/core.py
+index 8498ff9a8..fbef1cbd7 100644
+--- i/deluge/core/core.py
++++ w/deluge/core/core.py
+@@ -120,7 +120,7 @@ def __init__(
+ component.Component.__init__(self, 'Core')
+
+ # Start the libtorrent session.
+- user_agent = 'Deluge/{} libtorrent/{}'.format(DELUGE_VER, LT_VERSION)
++ user_agent = 'Deluge/{} libtorrent/{}'.format('2.0.3', LT_VERSION)
+ peer_id = self._create_peer_id(DELUGE_VER)
+ log.debug('Starting session (peer_id: %s, user_agent: %s)', peer_id, user_agent)
+ settings_pack = {
More information about the arch-commits
mailing list