[arch-commits] Commit in deluge/trunk (PKGBUILD user-agent-override.diff)

[Jan Steffens]

    Date: Monday, December 13, 2021 @ 09:36:14
  Author: heftig
Revision: 432382

2.0.4-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/user-agent-override.diff

--------------------------+
 PKGBUILD                 |   24 ++++++++++--------------
 user-agent-override.diff |   13 -------------
 2 files changed, 10 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 09:28:27 UTC (rev 432381)
+++ PKGBUILD	2021-12-13 09:36:14 UTC (rev 432382)
@@ -4,8 +4,9 @@
 
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
-pkgver=2.0.4.dev56+g2e466101f
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
+epoch=1
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
 url="https://deluge-torrent.org/"
 arch=(any)
@@ -29,6 +30,7 @@
   python-mako
 )
 makedepends=(
+  git
   python-setuptools
   python-wheel
   intltool
@@ -38,26 +40,20 @@
   librsvg
   xdg-utils
   libappindicator-gtk3
-  #python-pygame
+  python-pygame
   libnotify
-  git
 )
-_commit=2e466101fc20aa4314049d942d56e2be75fd70ae  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-        user-agent-override.diff)
-sha256sums=('SKIP'
-            '10ed8beaafa4b014162efacfa7c5a2d92ee0260aa03c48764c71de41a48450b3')
+_commit=65f7cf0d836220911be94a3536c1479df61abb4d  # tags/deluge-2.0.4^0
+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'
+  git describe --tags | sed 's/^deluge-//;s/\.dev0-/dev/;s/-/+/g'
 }
 
 prepare() {
   cd deluge
-
-  # Pretend to be stable deluge
-  patch -Np1 -i ../user-agent-override.diff
 }
 
 build() {
@@ -110,7 +106,7 @@
   )
   optdepends=(
     'libappindicator-gtk3: appindicator notifications'
-    #'python-pygame: audible notifications'
+    'python-pygame: audible notifications'
     'libnotify: desktop notifications'
   )
   replaces=('deluge<2.0.4.dev23+g2f1c008a2-2')

Deleted: user-agent-override.diff
===================================================================
--- user-agent-override.diff	2021-12-13 09:28:27 UTC (rev 432381)
+++ user-agent-override.diff	2021-12-13 09:36:14 UTC (rev 432382)
@@ -1,13 +0,0 @@
-diff --git i/deluge/core/core.py w/deluge/core/core.py
-index 2160f769a..8703d34f3 100644
---- i/deluge/core/core.py
-+++ w/deluge/core/core.py
-@@ -110,7 +110,7 @@
-     'upload_rate': 'net.sent_bytes',
- }
- 
--DELUGE_VER = deluge.common.get_version()
-+DELUGE_VER = '2.0.3'
- 
- 
- class Core(component.Component):