Patch nautilus extension for python3

2 files changed, 26 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f04d04da63cf..26bbc75ab2eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 # Generated by mksrcinfo v8
-# Sat Jan 27 04:42:57 UTC 2018
+# Sun Sep 16 14:25:48 UTC 2018
 pkgbase = folder-color-bzr
 	pkgdesc = Folder color switcher extension for nautilus, caja, and nemo
 	pkgver = 0.0.86.r281
-	pkgrel = 1
+	pkgrel = 2
 	url = http://foldercolor.tuxfamily.org/
 	arch = any
 	license = GPL3
 	makedepends = bzr
+	makedepends = python-distutils-extra
 	makedepends = python2-distutils-extra
+	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	optdepends = python2-nautilus: Nautilus extension
+	optdepends = python-nautilus: Nautilus extension
 	optdepends = nemo-python: Nemo extension
 	optdepends = python2-caja: Caja extension
 	conflicts = folder-color-nautilus-bzr
diff --git a/PKGBUILD b/PKGBUILD
index b0337c534dc0..a3d220cc1c39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 _pkgname=folder-color
 pkgname=${_pkgname}-bzr
 pkgver=0.0.86.r281
-pkgrel=1
+pkgrel=2
 pkgdesc="Folder color switcher extension for nautilus, caja, and nemo"
 arch=(any)
 url="http://foldercolor.tuxfamily.org/"
 license=(GPL3)
-makedepends=('bzr' 'python2-distutils-extra' 'python2-setuptools')
-optdepends=('python2-nautilus: Nautilus extension'
+makedepends=('bzr' python{,2}-distutils-extra python{,2}-setuptools)
+optdepends=('python-nautilus: Nautilus extension'
             'nemo-python:      Nemo extension'
             'python2-caja:     Caja extension')
 conflicts=('folder-color-nautilus-bzr')
@@ -22,19 +22,32 @@ pkgver() {
 }
 
 prepare() {
+	cd "${srcdir}"
 	for _fm in nemo caja nautilus common ; do
 		cp -r "${_pkgname}" "${_pkgname}-${_fm}"
-		cd "${_pkgname}-${_fm}"/install_scripts
+		pushd "${_pkgname}-${_fm}"/install_scripts
 		./${_fm}.sh
-		cd -
+		case "${_fm}" in 
+			#nemo-python ported to python3 in 3.9.0
+			nautilus) #|nemo
+				sed -i 's:urllib.unquote:urllib.parse.unquote:g' ../${_fm}-extension/folder-color.py ;;
+		esac
+		popd
 	done
 }
 
 package() {
-	for _fm in nemo caja nautilus common ; do
-		cd "${_pkgname}-${_fm}/"
+	for _fm in nautilus common ; do #nemo
+		pushd "${_pkgname}-${_fm}/"
+		python ./setup.py install --root="$pkgdir"
+		popd
+	done
+
+	for _fm in nemo caja common ; do
+		pushd "${_pkgname}-${_fm}/"
 		python2 ./setup.py install --root="$pkgdir"
-		cd -
+		popd
 	done
+
 }