[Update] netease-musicbox: v0.2.5.4

6 files changed, 84 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fadf9b3ed25..5dde9a3cdac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = netease-musicbox
 	pkgdesc = A sexy command line interface musicbox for NetEase based on Python
-	pkgver = 0.2.5.3
-	pkgrel = 2
+	pkgver = 0.2.5.4
+	pkgrel = 1
 	url = https://github.com/darknessomi/musicbox
 	install = netease-musicbox.install
 	arch = any
@@ -18,14 +18,14 @@ pkgbase = netease-musicbox
 	optdepends = python-dbus: lyrics support
 	provides = netease-musicbox
 	conflicts = netease-musicbox
-	source = musicbox-0.2.5.3.tar.gz::https://files.pythonhosted.org/packages/12/63/d65c908d4e76ad04622597f5d6e1f5742bc50fbd12e20f80a23736d533fe/NetEase-MusicBox-0.2.5.3.tar.gz
+	source = musicbox-0.2.5.4.tar.gz::https://github.com/darknessomi/musicbox/archive/0.2.5.4.tar.gz
 	source = LICENSE::https://raw.githubusercontent.com/darknessomi/musicbox/master/LICENSE.txt
-	source = 0001Remove_python_requests_cache_as_depends.patch
-	source = 0002Replace_pyqt4_to_pyqt5_as_depends.patch
-	sha256sums = 1688d8ff1898bc4a0b785187d122eed47c61a1ec017cf07d95139692dd0ea008
+	source = 0001Replace_pyqt4_to_pyqt5_as_depends.patch
+	source = 0002Remove_python_requests_cache_as_depends.patch
+	sha256sums = 4fdfd9061dfdec181736b56166a11bfe27ae9c4011f9c266b57fdfbca232afa3
 	sha256sums = 50efc98142cfffe413d73c87c91f2687dfb774217af923f03dfdc8426c9d9552
-	sha256sums = 85c4bd50059c6f038bcb1add01d67ecdb4f87d2861a30bcbe0ef97b8ee5172a2
-	sha256sums = 0d1a68ccb2c588753a1548775ae7a94de39f33d54744bde507a3bf9532039b0c
+	sha256sums = c910c12c5ffe23b3cc582fb718017c8dee5ef4e9dacfb1944f35266a79f8bbee
+	sha256sums = 24b74424cd624742e35631fafd24ad6fd6527807728deeb1cc0a81a1415370b7
 
 pkgname = netease-musicbox
 
diff --git a/0001Remove_python_requests_cache_as_depends.patch b/0001Remove_python_requests_cache_as_depends.patch
deleted file mode 100644
index 722ccbc3357e..000000000000
--- a/0001Remove_python_requests_cache_as_depends.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ura NetEase-MusicBox-0.2.5.2/NEMbox/api.py NetEase-MusicBox-0.2.5.2.new/NEMbox/api.py
---- NetEase-MusicBox-0.2.5.2/NEMbox/api.py	2018-06-07 17:35:47.000000000 +0800
-+++ NetEase-MusicBox-0.2.5.2.new/NEMbox/api.py	2018-08-16 10:49:27.764830182 +0800
-@@ -14,15 +14,12 @@
- 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 -ura NetEase-MusicBox-0.2.5.2/NetEase_MusicBox.egg-info/requires.txt NetEase-MusicBox-0.2.5.2.new/NetEase_MusicBox.egg-info/requires.txt
---- NetEase-MusicBox-0.2.5.2/NetEase_MusicBox.egg-info/requires.txt	2018-06-08 21:09:53.000000000 +0800
-+++ NetEase-MusicBox-0.2.5.2.new/NetEase_MusicBox.egg-info/requires.txt	2018-08-16 10:48:44.245429224 +0800
-@@ -1,3 +1,2 @@
--requests-cache
- pycryptodomex
- future
-diff -ura NetEase-MusicBox-0.2.5.2/setup.py NetEase-MusicBox-0.2.5.2.new/setup.py
---- NetEase-MusicBox-0.2.5.2/setup.py	2018-06-07 17:35:47.000000000 +0800
-+++ NetEase-MusicBox-0.2.5.2.new/setup.py	2018-08-16 10:49:04.110035044 +0800
-@@ -53,7 +53,6 @@
-     license=about['__license__'],
-     packages=find_packages(),
-     install_requires=[
--        'requests-cache',
-         'pycryptodomex',
-         'future',
-     ],
diff --git a/0002Replace_pyqt4_to_pyqt5_as_depends.patch b/0001Replace_pyqt4_to_pyqt5_as_depends.patch
index 6b1ed914d4f2..1f56ce62406a 100644
--- a/0002Replace_pyqt4_to_pyqt5_as_depends.patch
+++ b/0001Replace_pyqt4_to_pyqt5_as_depends.patch
@@ -1,6 +1,6 @@
-diff -ura NetEase-MusicBox-0.2.5.3/NEMbox/osdlyrics.py NetEase-MusicBox-0.2.5.3.new/NEMbox/osdlyrics.py
---- NetEase-MusicBox-0.2.5.3/NEMbox/osdlyrics.py	2018-06-08 21:01:27.000000000 +0800
-+++ NetEase-MusicBox-0.2.5.3.new/NEMbox/osdlyrics.py	2018-08-16 11:11:04.421430904 +0800
+diff -ura --color musicbox-0.2.5.4/NEMbox/osdlyrics.py musicbox-0.2.5.4.new/NEMbox/osdlyrics.py
+--- musicbox-0.2.5.4/NEMbox/osdlyrics.py	2018-11-28 15:23:07.000000000 +0900
++++ musicbox-0.2.5.4.new/NEMbox/osdlyrics.py	2018-11-28 18:13:03.653877974 +0900
 @@ -19,16 +19,16 @@
  config = Config()
  
@@ -30,7 +30,7 @@ diff -ura NetEase-MusicBox-0.2.5.3/NEMbox/osdlyrics.py NetEase-MusicBox-0.2.5.3.
 -            bl = QtGui.QApplication.desktop().screenGeometry(scn).bottomLeft()
 -            br = QtGui.QApplication.desktop().screenGeometry(scn).bottomRight()
 +            scn = QtWidgets.QApplication.desktop().screenNumber(
-+                QtWidgets.QApplication.desktop().cursor().pos())
++                + QtWidgets.QApplication.desktop().cursor().pos())
 +            bl = QtWidgets.QApplication.desktop().screenGeometry(scn).bottomLeft()
 +            br = QtWidgets.QApplication.desktop().screenGeometry(scn).bottomRight()
              bc = (bl + br) / 2
@@ -45,4 +45,3 @@ diff -ura NetEase-MusicBox-0.2.5.3/NEMbox/osdlyrics.py NetEase-MusicBox-0.2.5.3.
          lyrics = Lyrics()
          QtDBus.QDBusConnection.sessionBus().registerService('org.musicbox.Bus')
          QtDBus.QDBusConnection.sessionBus().registerObject('/', lyrics)
-只在 NetEase-MusicBox-0.2.5.3.new/NEMbox 存在：__pycache__
diff --git a/0002Remove_python_requests_cache_as_depends.patch b/0002Remove_python_requests_cache_as_depends.patch
new file mode 100644
index 000000000000..af9655fcee50
--- /dev/null
+++ b/0002Remove_python_requests_cache_as_depends.patch
@@ -0,0 +1,39 @@
+diff -ura --color musicbox-0.2.5.4/NEMbox/api.py musicbox-0.2.5.4.new/NEMbox/api.py
+--- musicbox-0.2.5.4/NEMbox/api.py	2018-11-28 15:23:07.000000000 +0900
++++ musicbox-0.2.5.4.new/NEMbox/api.py	2018-11-28 18:26:26.932612634 +0900
+@@ -17,7 +17,6 @@
+ import platform
+ import time
+ import requests
+-import requests_cache
+ 
+ from .config import Config
+ from .const import Constant
+@@ -25,8 +24,6 @@
+ from .encrypt import encrypted_request
+ from . import logger
+ 
+-requests_cache.install_cache(Constant.cache_path, expire_after=3600)
+-
+ log = logger.getLogger(__name__)
+ 
+ # 歌曲榜单地址
+diff -ura --color musicbox-0.2.5.4/requirements.txt musicbox-0.2.5.4.new/requirements.txt
+--- musicbox-0.2.5.4/requirements.txt	2018-11-28 15:23:07.000000000 +0900
++++ musicbox-0.2.5.4.new/requirements.txt	2018-11-28 18:26:53.357551926 +0900
+@@ -1,4 +1,3 @@
+ requests
+-requests-cache
+ pycryptodomex
+ future
+diff -ura --color musicbox-0.2.5.4/setup.py musicbox-0.2.5.4.new/setup.py
+--- musicbox-0.2.5.4/setup.py	2018-11-28 15:23:07.000000000 +0900
++++ musicbox-0.2.5.4.new/setup.py	2018-11-28 18:26:40.745039355 +0900
+@@ -53,7 +53,6 @@
+     license=about['__license__'],
+     packages=find_packages(),
+     install_requires=[
+-        'requests-cache',
+         'pycryptodomex',
+         'future',
+     ],
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..1273e8ec9942
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+### The MIT License (MIT)
+
+CopyRight (c) 2015 omi &lt;<a href="4399.omi@gmail.com">4399.omi@gmail.com</a>&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/PKGBUILD b/PKGBUILD
index 79598a6bd214..a9884202cd72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=netease-musicbox
 _gitname=musicbox
-pkgver=0.2.5.3
-pkgrel=2
+pkgver=0.2.5.4
+pkgrel=1
 pkgdesc="A sexy command line interface musicbox for NetEase based on Python"
 arch=(any)
 url="https://github.com/darknessomi/musicbox"
@@ -20,26 +20,25 @@ conflicts=('netease-musicbox')
 install=$pkgname.install
 license=('MIT')
 
-source=("musicbox-$pkgver.tar.gz::https://files.pythonhosted.org/packages/12/63/d65c908d4e76ad04622597f5d6e1f5742bc50fbd12e20f80a23736d533fe/NetEase-MusicBox-$pkgver.tar.gz"
+source=("musicbox-$pkgver.tar.gz::https://github.com/darknessomi/musicbox/archive/0.2.5.4.tar.gz"
         "LICENSE::https://raw.githubusercontent.com/darknessomi/musicbox/master/LICENSE.txt"
-        "0001Remove_python_requests_cache_as_depends.patch"
-        "0002Replace_pyqt4_to_pyqt5_as_depends.patch")
+        "0001Replace_pyqt4_to_pyqt5_as_depends.patch"
+        "0002Remove_python_requests_cache_as_depends.patch")     
 
-sha256sums=('1688d8ff1898bc4a0b785187d122eed47c61a1ec017cf07d95139692dd0ea008'
+sha256sums=('4fdfd9061dfdec181736b56166a11bfe27ae9c4011f9c266b57fdfbca232afa3'
             '50efc98142cfffe413d73c87c91f2687dfb774217af923f03dfdc8426c9d9552'
-            '85c4bd50059c6f038bcb1add01d67ecdb4f87d2861a30bcbe0ef97b8ee5172a2'
-            '0d1a68ccb2c588753a1548775ae7a94de39f33d54744bde507a3bf9532039b0c')
+            'c910c12c5ffe23b3cc582fb718017c8dee5ef4e9dacfb1944f35266a79f8bbee'
+            '24b74424cd624742e35631fafd24ad6fd6527807728deeb1cc0a81a1415370b7')
 
 prepare() {
-  cd "${srcdir}/NetEase-MusicBox-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001Remove_python_requests_cache_as_depends.patch"
-  patch -Np1 -i "${srcdir}/0002Replace_pyqt4_to_pyqt5_as_depends.patch"
+  cd "${srcdir}/musicbox-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001Replace_pyqt4_to_pyqt5_as_depends.patch"
+  patch -Np1 -i "${srcdir}/0002Remove_python_requests_cache_as_depends.patch"
 }
 
 package() {
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  cd "${srcdir}/NetEase-MusicBox-${pkgver}"
+  cd "${srcdir}/musicbox-${pkgver}"
   python setup.py install --root="${pkgdir}/" --optimize=1
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 # vim:set ts=2 sw=2 et: