desktop/quickswitch-i3: Updated for version 2.6.0.

Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>

4 files changed, 11 insertions, 30 deletions

diff --git a/desktop/quickswitch-i3/13_py_message.patch b/desktop/quickswitch-i3/13_py_message.patch
deleted file mode 100644
index 8964a427ddd50..0000000000000
--- a/desktop/quickswitch-i3/13_py_message.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- quickswitch-i3-2.1/quickswitch.original.py	2014-05-02 13:32:46.939145487 +0300
-+++ quickswitch-i3-2.1/quickswitch.py	2014-05-02 13:41:20.155729397 +0300
-@@ -30,8 +30,13 @@
- try:
-     import i3
- except ImportError:
-+    print("")
-+    print("----------------------------------------------------")
-     print("quickswitch requires i3-py.")
--    print("You can install it from the PyPI with ``pip install i3-py''.")
-+    print("You can install it from http://slackbuilds.org site")
-+    print("or from PyPI with ``pip install i3-py''.")
-+    print("----------------------------------------------------")
-+    print("")
-     exit(1)
- 
- 
diff --git a/desktop/quickswitch-i3/quickswitch-i3.SlackBuild b/desktop/quickswitch-i3/quickswitch-i3.SlackBuild
index e3d10129fd2b7..5b6d5c69a0280 100644
--- a/desktop/quickswitch-i3/quickswitch-i3.SlackBuild
+++ b/desktop/quickswitch-i3/quickswitch-i3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for quickswitch-i3
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2017  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=quickswitch-i3
-VERSION=${VERSION:-2.1}
+SRCNAM=quickswitch-for-i3
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,9 +70,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# fix i3-py error message for slackbuilds.org users
-patch -p1 < $CWD/13_py_message.patch
-
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/quickswitch-i3/quickswitch-i3.info b/desktop/quickswitch-i3/quickswitch-i3.info
index 8bb0c6a35dba7..24cfce5bc3910 100644
--- a/desktop/quickswitch-i3/quickswitch-i3.info
+++ b/desktop/quickswitch-i3/quickswitch-i3.info
@@ -1,8 +1,8 @@
 PRGNAM="quickswitch-i3"
-VERSION="2.1"
-HOMEPAGE="https://github.com/proxypoke/quickswitch-for-i3"
-DOWNLOAD="https://pypi.python.org/packages/source/q/quickswitch-i3/quickswitch-i3-2.1.tar.gz"
-MD5SUM="70a0f15f10720ae71efc64e0ca10b540"
+VERSION="2.6.0"
+HOMEPAGE="https://github.com/OliverUv/quickswitch-for-i3"
+DOWNLOAD="https://github.com/OliverUv/quickswitch-for-i3/archive/2.6.0.tar.gz"
+MD5SUM="3706f3bdc78697660b2a0eb54c0cb935"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="i3-py"
diff --git a/desktop/quickswitch-i3/slack-desc b/desktop/quickswitch-i3/slack-desc
index bd61660a8dec6..4d73bb4d5b516 100644
--- a/desktop/quickswitch-i3/slack-desc
+++ b/desktop/quickswitch-i3/slack-desc
@@ -14,6 +14,6 @@ quickswitch-i3: workspaces, using an interactive dmenu prompt. It has since gain
 quickswitch-i3: a lot of other functionality to make working with i3 even more
 quickswitch-i3: efficient.
 quickswitch-i3:
-quickswitch-i3: Homepage: https://github.com/proxypoke/quickswitch-for-i3
+quickswitch-i3: Homepage: https://github.com/OliverUv/quickswitch-for-i3
 quickswitch-i3:
 quickswitch-i3: