Date: Wednesday, November 20, 2019 @ 01:12:00 Author: heftig Revision: 369452
2.0.3+23+g5f1eada3e-1 Added: deluge/trunk/py3.8.diff Modified: deluge/trunk/PKGBUILD ------------+ PKGBUILD | 16 +++++++++++----- py3.8.diff | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-20 00:47:48 UTC (rev 369451) +++ PKGBUILD 2019-11-20 01:12:00 UTC (rev 369452) @@ -3,8 +3,8 @@ # Contributor: Hugo Doria <[email protected]> pkgname=deluge -pkgver=2.0.3 -pkgrel=2 +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/"; @@ -49,9 +49,11 @@ #'python-pygame: audible notifications' 'libnotify: desktop notifications' ) -_commit=b711cd258ae3001d5f1aa69617c22a2d258b1c06 # tags/deluge-2.0.3^0 -source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit") -sha256sums=('SKIP') +_commit=5f1eada3eae215f0fd489000e97792c892fb7b17 # develop +source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit" + py3.8.diff) +sha256sums=('SKIP' + 'a0225692e5c312d7980f0047f8e840803e8e05d6c525464ae9f335f56e205297') pkgver() { cd $pkgname @@ -60,6 +62,10 @@ prepare() { cd $pkgname + + # Remove a broken logging.Logger.findCaller override + # https://bugs.archlinux.org/task/64571 + patch -Np1 -i ../py3.8.diff } build() { Added: py3.8.diff =================================================================== --- py3.8.diff (rev 0) +++ py3.8.diff 2019-11-20 01:12:00 UTC (rev 369452) @@ -0,0 +1,30 @@ +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,
