[arch-commits] Commit in deluge/trunk (PKGBUILD py3.8.diff)
Jan Steffens
heftig at archlinux.org
Sun Dec 22 23:57:18 UTC 2019
Date: Sunday, December 22, 2019 @ 23:57:18
Author: heftig
Revision: 372137
2.0.4.dev23+g2f1c008a2-1
Modified:
deluge/trunk/PKGBUILD
Deleted:
deluge/trunk/py3.8.diff
------------+
PKGBUILD | 16 +++++-----------
py3.8.diff | 30 ------------------------------
2 files changed, 5 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-22 21:49:53 UTC (rev 372136)
+++ PKGBUILD 2019-12-22 23:57:18 UTC (rev 372137)
@@ -3,7 +3,7 @@
# Contributor: Hugo Doria <hugo at archlinux.org>
pkgname=deluge
-pkgver=2.0.3+23+g5f1eada3e
+pkgver=2.0.4.dev23+g2f1c008a2
pkgrel=1
pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
arch=(any)
@@ -49,23 +49,17 @@
#'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')
+_commit=2f1c008a26b50ab3487bd03bcabb39347d441f23 # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
pkgver() {
cd $pkgname
- git describe | sed 's/^deluge-//;s/-/+/g'
+ git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;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() {
Deleted: py3.8.diff
===================================================================
--- py3.8.diff 2019-12-22 21:49:53 UTC (rev 372136)
+++ py3.8.diff 2019-12-22 23:57:18 UTC (rev 372137)
@@ -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