* update deluge to 1:2.1.1-6
This commit is contained in:
parent
c962189b98
commit
8292ad2eec
74
deluge/.SRCINFO
Normal file
74
deluge/.SRCINFO
Normal file
@ -0,0 +1,74 @@
|
||||
pkgbase = deluge
|
||||
pkgdesc = BitTorrent client with multiple user interfaces in a client/server model
|
||||
pkgver = 2.1.1
|
||||
pkgrel = 6
|
||||
epoch = 1
|
||||
url = https://deluge-torrent.org/
|
||||
arch = any
|
||||
license = GPL-3.0-only WITH cryptsetup-OpenSSL-exception
|
||||
makedepends = glib2
|
||||
makedepends = gtk3
|
||||
makedepends = hicolor-icon-theme
|
||||
makedepends = librsvg
|
||||
makedepends = pango
|
||||
makedepends = python-cairo
|
||||
makedepends = python-gobject
|
||||
makedepends = xdg-utils
|
||||
makedepends = git
|
||||
makedepends = intltool
|
||||
makedepends = libappindicator-gtk3
|
||||
makedepends = libnotify
|
||||
makedepends = python-build
|
||||
makedepends = python-installer
|
||||
makedepends = python-pygame
|
||||
makedepends = python-rjsmin
|
||||
makedepends = python-wheel
|
||||
depends = libtorrent-rasterbar
|
||||
depends = openssl
|
||||
depends = python
|
||||
depends = python-chardet
|
||||
depends = python-dbus
|
||||
depends = python-distro
|
||||
depends = python-geoip
|
||||
depends = python-idna
|
||||
depends = python-ifaddr
|
||||
depends = python-mako
|
||||
depends = python-pillow
|
||||
depends = python-pyopenssl
|
||||
depends = python-rencode
|
||||
depends = python-incremental
|
||||
depends = python-service-identity
|
||||
depends = python-setproctitle
|
||||
depends = python-setuptools
|
||||
depends = python-twisted
|
||||
depends = python-xdg
|
||||
depends = python-zope-interface
|
||||
source = git+https://git.deluge-torrent.org/deluge?signed#tag=deluge-2.1.1
|
||||
source = 0001-Update-metainfo-install-path.patch
|
||||
source = 0002-Fix-data-installation-when-building-wheel.patch
|
||||
validpgpkeys = EA01185D0E8AA00D6323A30890597A687B836BA3
|
||||
b2sums = e53ed66348f0b71d17aa3e44375c81656b304f9dc44750c882261cd15b9f58f653304ceee9a122998b2128689b1adb08b6e790d1e56b473c0a46ae398f21e0a1
|
||||
b2sums = 864c8ca71e718e3d8cdd6021f5e3ddf82782955da6d25f9f3077a8dd59d2a8a798460c0f26fcf95b3b17d595b69c2f10b92a564c4482e3ac0ca27304dba9bd39
|
||||
b2sums = c503eface42fc12cb04086a5a77a862ee44f78ecdd6ad732d94e21acff1238511d3e8551d531e7443f6f099fec7b81846701b4988f4bde2cf8670fc47ecfa52c
|
||||
|
||||
pkgname = deluge
|
||||
|
||||
pkgname = deluge-gtk
|
||||
pkgdesc = GTK UI for Deluge
|
||||
depends = glib2
|
||||
depends = gtk3
|
||||
depends = hicolor-icon-theme
|
||||
depends = librsvg
|
||||
depends = pango
|
||||
depends = python-cairo
|
||||
depends = python-gobject
|
||||
depends = xdg-utils
|
||||
depends = deluge=1:2.1.1-6
|
||||
depends = python
|
||||
depends = python-rencode
|
||||
depends = python-setproctitle
|
||||
depends = python-twisted
|
||||
optdepends = libappindicator-gtk3: appindicator notifications
|
||||
optdepends = python-pygame: audible notifications
|
||||
optdepends = libnotify: desktop notifications
|
||||
replaces = deluge<2.0.4.dev23+g2f1c008a2-2
|
||||
5
deluge/.nvchecker.toml
Normal file
5
deluge/.nvchecker.toml
Normal file
@ -0,0 +1,5 @@
|
||||
[deluge]
|
||||
source = "git"
|
||||
git = "https://git.deluge-torrent.org/deluge"
|
||||
prefix = "deluge-"
|
||||
exclude_regex = ".*(dev|beta|rc).*"
|
||||
2854
deluge/0001-Update-metainfo-install-path.patch
Normal file
2854
deluge/0001-Update-metainfo-install-path.patch
Normal file
File diff suppressed because it is too large
Load Diff
63
deluge/0002-Fix-data-installation-when-building-wheel.patch
Normal file
63
deluge/0002-Fix-data-installation-when-building-wheel.patch
Normal file
@ -0,0 +1,63 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Mon, 10 Jun 2024 19:55:38 +0200
|
||||
Subject: [PATCH] Fix data installation when building wheel
|
||||
|
||||
---
|
||||
setup.py | 21 +--------------------
|
||||
1 file changed, 1 insertion(+), 20 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index ef70f20b0aa7..c779b4debd0e 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -14,7 +14,6 @@
|
||||
import sys
|
||||
from distutils.command.build import build as _build
|
||||
from distutils.command.clean import clean as _clean
|
||||
-from distutils.command.install_data import install_data as _install_data
|
||||
from shutil import rmtree, which
|
||||
|
||||
from setuptools import Command, find_packages, setup
|
||||
@@ -394,22 +393,6 @@ def run(self):
|
||||
print('Warning: libtorrent (libtorrent-rasterbar) not found: %s' % ex)
|
||||
|
||||
|
||||
-class InstallData(_install_data):
|
||||
- """Custom class to fix `setup install` copying data files to incorrect location. (Bug #1389)"""
|
||||
-
|
||||
- def finalize_options(self):
|
||||
- self.install_dir = None
|
||||
- self.set_undefined_options(
|
||||
- 'install',
|
||||
- ('install_data', 'install_dir'),
|
||||
- ('root', 'root'),
|
||||
- ('force', 'force'),
|
||||
- )
|
||||
-
|
||||
- def run(self):
|
||||
- _install_data.run(self)
|
||||
-
|
||||
-
|
||||
class Clean(_clean):
|
||||
sub_commands = _clean.sub_commands + [
|
||||
('clean_plugins', None),
|
||||
@@ -439,7 +422,6 @@ def run(self):
|
||||
'build_plugins': BuildPlugins,
|
||||
'build_docs': BuildDoc,
|
||||
'spellcheck_docs': BuildDoc,
|
||||
- 'install_data': InstallData,
|
||||
'clean_plugins': CleanPlugins,
|
||||
'clean_trans': CleanTranslations,
|
||||
'clean_docs': CleanDocs,
|
||||
@@ -474,9 +456,8 @@ def run(self):
|
||||
),
|
||||
]
|
||||
)
|
||||
- if os.path.isfile(desktop_data):
|
||||
+ if not windows_check() and which('intltool-merge'):
|
||||
_data_files.append(('share/applications', [desktop_data]))
|
||||
- if os.path.isfile(metainfo_data):
|
||||
_data_files.append(('share/metainfo', [metainfo_data]))
|
||||
|
||||
|
||||
113
deluge/PKGBUILD
113
deluge/PKGBUILD
@ -4,64 +4,84 @@
|
||||
# Contributor: Hugo Doria <hugo@archlinux.org>
|
||||
|
||||
pkgbase=deluge
|
||||
pkgname=(deluge deluge-gtk)
|
||||
pkgname=(
|
||||
deluge
|
||||
deluge-gtk
|
||||
)
|
||||
pkgver=2.1.1
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
epoch=1
|
||||
pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
|
||||
url="https://deluge-torrent.org/"
|
||||
arch=(any)
|
||||
license=(GPL3)
|
||||
license=("GPL-3.0-only WITH cryptsetup-OpenSSL-exception")
|
||||
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-zope-interface>=4.4.2'
|
||||
python-chardet
|
||||
python-setproctitle
|
||||
python-pillow
|
||||
libtorrent-rasterbar
|
||||
openssl
|
||||
python
|
||||
python-chardet
|
||||
python-dbus
|
||||
python-ifaddr
|
||||
python-distro
|
||||
'libtorrent-rasterbar>=1.1.1'
|
||||
python-geoip
|
||||
python-idna
|
||||
python-ifaddr
|
||||
python-mako
|
||||
python-pillow
|
||||
python-pyopenssl
|
||||
python-rencode
|
||||
python-incremental
|
||||
python-service-identity
|
||||
python-setproctitle
|
||||
python-setuptools
|
||||
python-twisted
|
||||
python-xdg
|
||||
python-zope-interface
|
||||
)
|
||||
_gtk_depends=(
|
||||
glib2
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
librsvg
|
||||
pango
|
||||
python-cairo
|
||||
python-gobject
|
||||
xdg-utils
|
||||
)
|
||||
makedepends=(
|
||||
"${_gtk_depends[@]}"
|
||||
git
|
||||
python-setuptools
|
||||
python-wheel
|
||||
intltool
|
||||
python-rjsmin
|
||||
gtk3
|
||||
python-gobject
|
||||
python-cairo
|
||||
librsvg
|
||||
xdg-utils
|
||||
libappindicator-gtk3
|
||||
python-pygame
|
||||
libnotify
|
||||
python-build
|
||||
python-installer
|
||||
python-pygame
|
||||
python-rjsmin
|
||||
python-wheel
|
||||
)
|
||||
source=(
|
||||
"git+https://git.deluge-torrent.org/deluge?signed#tag=deluge-$pkgver"
|
||||
0001-Update-metainfo-install-path.patch
|
||||
0002-Fix-data-installation-when-building-wheel.patch
|
||||
)
|
||||
b2sums=('e53ed66348f0b71d17aa3e44375c81656b304f9dc44750c882261cd15b9f58f653304ceee9a122998b2128689b1adb08b6e790d1e56b473c0a46ae398f21e0a1'
|
||||
'864c8ca71e718e3d8cdd6021f5e3ddf82782955da6d25f9f3077a8dd59d2a8a798460c0f26fcf95b3b17d595b69c2f10b92a564c4482e3ac0ca27304dba9bd39'
|
||||
'c503eface42fc12cb04086a5a77a862ee44f78ecdd6ad732d94e21acff1238511d3e8551d531e7443f6f099fec7b81846701b4988f4bde2cf8670fc47ecfa52c')
|
||||
validpgpkeys=(
|
||||
EA01185D0E8AA00D6323A30890597A687B836BA3 # Calum Lind <calumlind@gmail.com>
|
||||
)
|
||||
_tag=bad29eb302ebaae8306fc2ecf4a953926d401173 # tags/deluge-2.1.1
|
||||
source=("git+https://git.deluge-torrent.org/deluge?signed#tag=$_tag")
|
||||
b2sums=('SKIP')
|
||||
validpgpkeys=(EA01185D0E8AA00D6323A30890597A687B836BA3) # Calum Lind <calumlind@gmail.com>
|
||||
|
||||
pkgver() {
|
||||
cd deluge
|
||||
git describe --tags | sed 's/^deluge-//;s/\.dev0-/dev/;s/[^-]*-g/r&/;s/-/+/g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd deluge
|
||||
|
||||
# Installation fixes
|
||||
git apply -3 ../0001-Update-metainfo-install-path.patch
|
||||
git apply -3 ../0002-Fix-data-installation-when-building-wheel.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd deluge
|
||||
python setup.py build
|
||||
python -m build --wheel --no-isolation
|
||||
}
|
||||
|
||||
_pick() {
|
||||
@ -76,7 +96,7 @@ _pick() {
|
||||
|
||||
package_deluge() {
|
||||
cd deluge
|
||||
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
|
||||
python -m installer --destdir="$pkgdir" dist/*.whl
|
||||
|
||||
install -Dt "$pkgdir/usr/lib/systemd/system" \
|
||||
-m644 packaging/systemd/*.service
|
||||
@ -92,24 +112,25 @@ package_deluge() {
|
||||
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 "$pkgdir"/usr/bin/deluge-gtk
|
||||
_pick gtk "$pkgdir"/usr/share/man/man1/deluge-gtk.1
|
||||
_pick gtk "$pkgdir"/usr/share/{applications,icons,metainfo,pixmaps}
|
||||
|
||||
local sitedir="$(python -c 'import site; print(site.getsitepackages()[0])')"
|
||||
_pick gtk "${sitedir#/}"/deluge/ui/gtk3
|
||||
_pick gtk "$pkgdir$sitedir"/deluge/ui/gtk3
|
||||
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
|
||||
}
|
||||
|
||||
package_deluge-gtk() {
|
||||
pkgdesc="GTK UI for Deluge"
|
||||
depends=(
|
||||
"${_gtk_depends[@]}"
|
||||
"deluge=$epoch:$pkgver-$pkgrel"
|
||||
gtk3
|
||||
librsvg
|
||||
python-cairo
|
||||
python-gobject
|
||||
xdg-utils
|
||||
python
|
||||
python-rencode
|
||||
python-setproctitle
|
||||
python-twisted
|
||||
)
|
||||
optdepends=(
|
||||
'libappindicator-gtk3: appindicator notifications'
|
||||
@ -119,6 +140,8 @@ package_deluge-gtk() {
|
||||
replaces=('deluge<2.0.4.dev23+g2f1c008a2-2')
|
||||
|
||||
mv gtk/* "$pkgdir"
|
||||
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 deluge/LICENSE
|
||||
}
|
||||
|
||||
# vim:set sw=2 sts=-1 et:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user