3 files changed, 50 insertions, 15 deletions
diff --git a/python/i3expo-ng/i3expo-ng.SlackBuild b/python/i3expo-ng/i3expo-ng.SlackBuild
index 54799e1f33..3285ae3a62 100644
--- a/python/i3expo-ng/i3expo-ng.SlackBuild
+++ b/python/i3expo-ng/i3expo-ng.SlackBuild
@@ -51,20 +51,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -73,6 +59,7 @@ cd $TMP
 rm -rf $PRGNAM-$COMMIT
 tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
 cd $PRGNAM-$COMMIT
+cat i3expo-ng.xdg-base-dirs.patch | patch -p1 || exit
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/python/i3expo-ng/i3expo-ng.info b/python/i3expo-ng/i3expo-ng.info
index 0975dda4bc..1e6aac9a4a 100644
--- a/python/i3expo-ng/i3expo-ng.info
+++ b/python/i3expo-ng/i3expo-ng.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/morrolinux/i3expo-ng/archive/b55a74b/i3expo-ng-b55a
 MD5SUM="158026d34b865e3e431380b7d1a7971c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-pygame i3ipc python3-xdg"
+REQUIRES="python3-pygame i3ipc python3-xdg-base-dirs"
 MAINTAINER="Tonus"
 EMAIL="tonus1@free.fr"
diff --git a/python/i3expo-ng/i3expo-ng.xdg-base-dirs.patch b/python/i3expo-ng/i3expo-ng.xdg-base-dirs.patch
new file mode 100644
index 0000000000..2e9bc26c6c
--- /dev/null
+++ b/python/i3expo-ng/i3expo-ng.xdg-base-dirs.patch
@@ -0,0 +1,48 @@
+--- a/README.md
++++ b/README.md
+@@ -40,7 +40,7 @@ Example output:
+ - PyGame
+ - i3ipc
+ - pillow
+-- xdg
++- xdg-base-dirs
+ - pyxdg
+ # Usage
+ 
+diff --git a/i3expod.py b/i3expod.py
+index 74150fe..7c1df6b 100755
+--- a/i3expod.py
++++ b/i3expod.py
+@@ -18,7 +18,7 @@
+ import prtscn
+ 
+ try:
+-    from xdg import xdg_config_home
++    from xdg_base_dirs import xdg_config_home
+ 
+     xdg_config_home = str(xdg_config_home())
+ except ImportError:
+diff --git a/requirements.txt b/requirements.txt
+index 48220d8..94bfe75 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,5 +1,5 @@
+ pygame
+ i3ipc
+ pillow
+-xdg
++xdg-base-dirs
+ pyxdg
+diff --git a/setup.py b/setup.py
+index 173aee2..e0ae273 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@
+         'pygame',
+         'i3ipc',
+         'pillow',
+-        'xdg',
++        'xdg-base-dirs',
+         'pyxdg',
+     ],
+     entry_points={