[arch-commits] Commit in deluge/repos/extra-any (PKGBUILD PKGBUILD fix-ngettext.diff)
Jan Steffens
heftig at archlinux.org
Sun Feb 23 20:11:38 UTC 2020
Date: Sunday, February 23, 2020 @ 20:11:37
Author: heftig
Revision: 376110
archrelease: copy trunk to extra-any
Added:
deluge/repos/extra-any/PKGBUILD
(from rev 376109, deluge/trunk/PKGBUILD)
deluge/repos/extra-any/fix-ngettext.diff
(from rev 376109, deluge/trunk/fix-ngettext.diff)
Deleted:
deluge/repos/extra-any/PKGBUILD
-------------------+
PKGBUILD | 233 ++++++++++++++++++++++++++--------------------------
fix-ngettext.diff | 13 ++
2 files changed, 131 insertions(+), 115 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-23 20:11:18 UTC (rev 376109)
+++ PKGBUILD 2020-02-23 20:11:37 UTC (rev 376110)
@@ -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.dev23+g2f1c008a2
-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=2f1c008a26b50ab3487bd03bcabb39347d441f23 # 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 376109, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-23 20:11:37 UTC (rev 376110)
@@ -0,0 +1,118 @@
+# 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.dev23+g2f1c008a2
+pkgrel=3
+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=2f1c008a26b50ab3487bd03bcabb39347d441f23 # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+ fix-ngettext.diff)
+sha256sums=('SKIP'
+ '27154397f2b22e55e2ad74f74da2f4f083bce1fcee90f8ba9306e6ef13ce98c0')
+
+pkgver() {
+ cd deluge
+ git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
+}
+
+prepare() {
+ cd deluge
+ git apply -3 ../fix-ngettext.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/fix-ngettext.diff (from rev 376109, deluge/trunk/fix-ngettext.diff)
===================================================================
--- fix-ngettext.diff (rev 0)
+++ fix-ngettext.diff 2020-02-23 20:11:37 UTC (rev 376110)
@@ -0,0 +1,13 @@
+diff --git i/deluge/i18n/util.py w/deluge/i18n/util.py
+index bd002f7a2..90568fc5b 100644
+--- i/deluge/i18n/util.py
++++ w/deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+ # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+ kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+
+- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
++ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
+ builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+
+ libintl = None
More information about the arch-commits
mailing list