[Update] netease-musicbox-git: remove the old patch file

4 files changed, 14 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89172d3d6f36..46bc8ef6eb1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = netease-musicbox-git
 	pkgdesc = A sexy command line interface musicbox for NetEase based on Python
-	pkgver = r577.cdcbd50
-	pkgrel = 2
+	pkgver = r579.8ce4a7e
+	pkgrel = 1
 	url = https://github.com/darknessomi/musicbox
 	install = netease-musicbox-git.install
 	arch = any
@@ -21,12 +21,10 @@ pkgbase = netease-musicbox-git
 	conflicts = netease-musicbox
 	source = musicbox::git+https://github.com/darknessomi/musicbox
 	source = LICENSE::https://raw.githubusercontent.com/darknessomi/musicbox/master/LICENSE.txt
-	source = 0001-Remove_python_requests_cache_as_depends.patch
-	source = 0002-Replace_pyqt4_to_pyqt5_as_depends.patch
+	source = 0001-Fixed-Replace_pyqt4_to_pyqt5_as_depends.patch
 	sha256sums = SKIP
 	sha256sums = 50efc98142cfffe413d73c87c91f2687dfb774217af923f03dfdc8426c9d9552
-	sha256sums = 0faefb24ad158814cda0a5fd2262c2308182d22791587382d68da09922338052
-	sha256sums = f9c95f8441f43fc13c2cadb1f62b6e33658474f7671d11b3f0a66fe322e0a9e9
+	sha256sums = 55b4dd116b8b7a1b47854f52ce1e9f8422fb72702beb4c259bda388e23060484
 
 pkgname = netease-musicbox-git
 
diff --git a/0002-Replace_pyqt4_to_pyqt5_as_depends.patch b/0001-Fixed-Replace_pyqt4_to_pyqt5_as_depends.patch
index 299b340f8a69..de94770de8fc 100644
--- a/0002-Replace_pyqt4_to_pyqt5_as_depends.patch
+++ b/0001-Fixed-Replace_pyqt4_to_pyqt5_as_depends.patch
@@ -1,7 +1,7 @@
-From 3288e1988bec9ba6a6d2b33fa90ea0024c4d7f7f Mon Sep 17 00:00:00 2001
-From: axionl <axionl@aosc.io>
-Date: Wed, 29 Aug 2018 21:25:57 +0800
-Subject: [PATCH 2/2] Replace_pyqt4_to_pyqt5_as_depends
+From 9a6793e6dab6811c220222f15c68099d6fc902d2 Mon Sep 17 00:00:00 2001
+From: axionl <i@axionl.me>
+Date: Wed, 21 Nov 2018 01:34:22 +0900
+Subject: [PATCH] [Fixed] Replace_pyqt4_to_pyqt5_as_depends
 
 ---
  NEMbox/osdlyrics.py | 16 ++++++++--------
@@ -56,5 +56,5 @@ index bd96e09..5e66843 100644
          QtDBus.QDBusConnection.sessionBus().registerService('org.musicbox.Bus')
          QtDBus.QDBusConnection.sessionBus().registerObject('/', lyrics)
 -- 
-2.18.0
+2.19.1
 
diff --git a/0001-Remove_python_requests_cache_as_depends.patch b/0001-Remove_python_requests_cache_as_depends.patch
deleted file mode 100644
index 2e250e49c64e..000000000000
--- a/0001-Remove_python_requests_cache_as_depends.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e42f7f7ae526450315b6e693daa6ddc9fb1c7b53 Mon Sep 17 00:00:00 2001
-From: axionl <axionl@aosc.io>
-Date: Wed, 29 Aug 2018 21:20:47 +0800
-Subject: [PATCH 1/2] Remove_python_requests_cache_as_depends
-
----
- NEMbox/api.py    | 7 +------
- requirements.txt | 1 -
- setup.py         | 1 -
- 3 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/NEMbox/api.py b/NEMbox/api.py
-index da4c0fb..6a4855b 100644
---- a/NEMbox/api.py
-+++ b/NEMbox/api.py
-@@ -10,19 +10,14 @@ from __future__ import (
- )
- 
- import json
-+import requests
- from collections import OrderedDict
- from http.cookiejar import LWPCookieJar
--
--import requests
--import requests_cache
--
- from .config import Config
- from .storage import Storage
- from .encrypt import encrypted_request
- from . import logger
- 
--requests_cache.install_cache('nemcache', expire_after=3600)
--
- log = logger.getLogger(__name__)
- 
- # 歌曲榜单地址
-diff --git a/requirements.txt b/requirements.txt
-index eda4cbc..fe8c209 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,4 +1,3 @@
- requests
--requests-cache
- pycryptodomex
- future
-diff --git a/setup.py b/setup.py
-index b457293..babf0ff 100644
---- a/setup.py
-+++ b/setup.py
-@@ -53,7 +53,6 @@ setup(
-     license=about['__license__'],
-     packages=find_packages(),
-     install_requires=[
--        'requests-cache',
-         'pycryptodomex',
-         'future',
-     ],
--- 
-2.18.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 4986b01ec2c2..10c01c1eccdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=netease-musicbox-git
 _gitname=musicbox
-pkgver=r577.cdcbd50
-pkgrel=2
+pkgver=r579.8ce4a7e
+pkgrel=1
 pkgdesc="A sexy command line interface musicbox for NetEase based on Python"
 arch=(any)
 url="https://github.com/darknessomi/musicbox"
@@ -22,13 +22,11 @@ license=('MIT')
 
 source=("${_gitname}::git+https://github.com/darknessomi/musicbox"
         "LICENSE::https://raw.githubusercontent.com/darknessomi/musicbox/master/LICENSE.txt"
-        "0001-Remove_python_requests_cache_as_depends.patch"
-        "0002-Replace_pyqt4_to_pyqt5_as_depends.patch")
+        "0001-Fixed-Replace_pyqt4_to_pyqt5_as_depends.patch")
 
 sha256sums=('SKIP'
             '50efc98142cfffe413d73c87c91f2687dfb774217af923f03dfdc8426c9d9552'
-            '0faefb24ad158814cda0a5fd2262c2308182d22791587382d68da09922338052'
-            'f9c95f8441f43fc13c2cadb1f62b6e33658474f7671d11b3f0a66fe322e0a9e9')
+            '55b4dd116b8b7a1b47854f52ce1e9f8422fb72702beb4c259bda388e23060484')
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
@@ -37,8 +35,7 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${_gitname}"
-  patch -Np1 -i "${srcdir}/0001-Remove_python_requests_cache_as_depends.patch"
-  patch -Np1 -i "${srcdir}/0002-Replace_pyqt4_to_pyqt5_as_depends.patch"
+  patch -Np1 -i "${srcdir}/0001-Fixed-Replace_pyqt4_to_pyqt5_as_depends.patch"
 }
 
 package() {