[arch-commits] Commit in deluge/repos/extra-any (PKGBUILD PKGBUILD py3.8.diff)

Jan Steffens heftig at archlinux.org
Sun Dec 22 23:57:48 UTC 2019


    Date: Sunday, December 22, 2019 @ 23:57:48
  Author: heftig
Revision: 372138

archrelease: copy trunk to extra-any

Added:
  deluge/repos/extra-any/PKGBUILD
    (from rev 372137, deluge/trunk/PKGBUILD)
Deleted:
  deluge/repos/extra-any/PKGBUILD
  deluge/repos/extra-any/py3.8.diff

------------+
 PKGBUILD   |  180 ++++++++++++++++++++++++++++-------------------------------
 py3.8.diff |   30 ---------
 2 files changed, 87 insertions(+), 123 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-22 23:57:18 UTC (rev 372137)
+++ PKGBUILD	2019-12-22 23:57:48 UTC (rev 372138)
@@ -1,93 +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>
-
-pkgname=deluge
-pkgver=2.0.3+23+g5f1eada3e
-pkgrel=1
-pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
-arch=(any)
-url="https://deluge-torrent.org/"
-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
-  xdg-utils
-  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
-  libappindicator-gtk3
-  #python-pygame
-  libnotify
-  git
-)
-optdepends=(
-  'gtk3: gtk ui'
-  'python-gobject: gtk ui'
-  'python-cairo: gtk ui'
-  'librsvg: gtk ui'
-  'libappindicator-gtk3: appindicator notifications'
-  #'python-pygame: audible notifications'
-  'libnotify: desktop notifications'
-)
-_commit=5f1eada3eae215f0fd489000e97792c892fb7b17  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-        py3.8.diff)
-sha256sums=('SKIP'
-            'a0225692e5c312d7980f0047f8e840803e8e05d6c525464ae9f335f56e205297')
-
-pkgver() {
-  cd $pkgname
-  git describe | sed 's/^deluge-//;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Remove a broken logging.Logger.findCaller override
-  # https://bugs.archlinux.org/task/64571
-  patch -Np1 -i ../py3.8.diff
-}
-
-build() {
-  cd $pkgname
-  python setup.py build
-}
-
-package() {
-  cd $pkgname
-  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"
-}
-
-# vim:set sw=2 et:

Copied: deluge/repos/extra-any/PKGBUILD (from rev 372137, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-22 23:57:48 UTC (rev 372138)
@@ -0,0 +1,87 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=deluge
+pkgver=2.0.4.dev23+g2f1c008a2
+pkgrel=1
+pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
+arch=(any)
+url="https://deluge-torrent.org/"
+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
+  xdg-utils
+  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
+  libappindicator-gtk3
+  #python-pygame
+  libnotify
+  git
+)
+optdepends=(
+  'gtk3: gtk ui'
+  'python-gobject: gtk ui'
+  'python-cairo: gtk ui'
+  'librsvg: gtk ui'
+  'libappindicator-gtk3: appindicator notifications'
+  #'python-pygame: audible notifications'
+  'libnotify: desktop notifications'
+)
+_commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  cd $pkgname
+  python setup.py build
+}
+
+package() {
+  cd $pkgname
+  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"
+}
+
+# vim:set sw=2 et:

Deleted: py3.8.diff
===================================================================
--- py3.8.diff	2019-12-22 23:57:18 UTC (rev 372137)
+++ py3.8.diff	2019-12-22 23:57:48 UTC (rev 372138)
@@ -1,30 +0,0 @@
-diff --git i/deluge/log.py w/deluge/log.py
-index 75e8308b5..fbe206ad9 100644
---- i/deluge/log.py
-+++ w/deluge/log.py
-@@ -86,25 +86,6 @@ def critical(self, msg, *args, **kwargs):
-     def exception(self, msg, *args, **kwargs):
-         yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
- 
--    def findCaller(self, stack_info=False):  # NOQA: N802
--        f = logging.currentframe().f_back
--        rv = '(unknown file)', 0, '(unknown function)'
--        while hasattr(f, 'f_code'):
--            co = f.f_code
--            filename = os.path.normcase(co.co_filename)
--            if filename in (
--                __file__.replace('.pyc', '.py'),
--                defer.__file__.replace('.pyc', '.py'),
--            ):
--                f = f.f_back
--                continue
--            if common.PY2:
--                rv = (filename, f.f_lineno, co.co_name)
--            else:
--                rv = (filename, f.f_lineno, co.co_name, None)
--            break
--        return rv
--
- 
- levels = {
-     'info': logging.INFO,


More information about the arch-commits mailing list