[arch-commits] Commit in deluge/trunk (PKGBUILD fix-ngettext.diff)

[Jan Steffens]

    Date: Sunday, June 28, 2020 @ 02:24:57
  Author: heftig
Revision: 390533

2.0.4.dev38+g23a48dd01-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/fix-ngettext.diff

-------------------+
 PKGBUILD          |   13 +++++--------
 fix-ngettext.diff |   13 -------------
 2 files changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-28 01:56:41 UTC (rev 390532)
+++ PKGBUILD	2020-06-28 02:24:57 UTC (rev 390533)
@@ -4,8 +4,8 @@
 
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
-pkgver=2.0.4.dev23+g2f1c008a2
-pkgrel=3
+pkgver=2.0.4.dev38+g23a48dd01
+pkgrel=1
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
 url="https://deluge-torrent.org/"
 arch=(any)
@@ -41,11 +41,9 @@
   libnotify
   git
 )
-_commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-        fix-ngettext.diff)
-sha256sums=('SKIP'
-            '27154397f2b22e55e2ad74f74da2f4f083bce1fcee90f8ba9306e6ef13ce98c0')
+_commit=23a48dd01c86ef01cd1d13371de51247ec9a503b  # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd deluge
@@ -54,7 +52,6 @@
 
 prepare() {
   cd deluge
-  git apply -3 ../fix-ngettext.diff
 }
 
 build() {

Deleted: fix-ngettext.diff
===================================================================
--- fix-ngettext.diff	2020-06-28 01:56:41 UTC (rev 390532)
+++ fix-ngettext.diff	2020-06-28 02:24:57 UTC (rev 390533)
@@ -1,13 +0,0 @@
-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