Bump up gdrivefs-0.14.8-1

4 files changed, 12 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ba469ff645f..b7d7b6ff175b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 15 14:28:51 UTC 2016
+# Sun Jul 17 07:27:59 UTC 2016
 pkgbase = gdrivefs
 	pkgdesc = A complete FUSE adapter for Google Drive
-	pkgver = 0.16.6
+	pkgver = 0.14.8
 	pkgrel = 1
 	url = https://github.com/dsoprea/GDriveFS
 	arch = any
@@ -17,8 +17,8 @@ pkgbase = gdrivefs
 	depends = python2-dateutil
 	depends = python2-six
 	depends = python2-wsgiref
-	source = https://github.com/dsoprea/GDriveFS/archive/0.16.6.tar.gz
-	sha256sums = 4a1fd78248385c6782b58b4882b12a54dec4b73bfc15b71a602e18335d089349
+	source = https://github.com/dsoprea/GDriveFS/archive/0.14.8.tar.gz
+	sha256sums = 7c7f0f8f3b7079f7823c0d27c751f3ae43c0ca0e7f6bbdf93da6dc29150890b5
 
 pkgname = gdrivefs
 
diff --git a/PKGBUILD b/PKGBUILD
index 1186d6cb9877..e4cdfd9000eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gdrivefs
 _gitname=GDriveFS
-pkgver=0.16.6
+pkgver=0.14.8
 pkgrel=1
 pkgdesc="A complete FUSE adapter for Google Drive"
 url="https://github.com/dsoprea/GDriveFS"
@@ -11,13 +11,16 @@ makedepends=('python2-distribute')
 license=('GPL2')
 arch=('any')
 source=("${url}/archive/${pkgver}.tar.gz")
-sha256sums=('4a1fd78248385c6782b58b4882b12a54dec4b73bfc15b71a602e18335d089349')
+sha256sums=('7c7f0f8f3b7079f7823c0d27c751f3ae43c0ca0e7f6bbdf93da6dc29150890b5')
 
 build() {
   cd ${srcdir}/${_gitname}-${pkgver}
-  # patch -p1 < ../../pull_134.patch
-  # patch -p1 < ../../pull_147.patch
-  # patch -p1 < ../../pull_154_utf8.patch
+  # Fix for multi threaded (issue 132)
+  patch -p1 < ../../pull_147.patch
+
+  # Add support to utf8 instead of ASCII
+  patch -p1 < ../../pull_154_utf8.patch
+
   python2 setup.py build
 }
 
diff --git a/pull_134.patch b/pull_134.patch
deleted file mode 100644
index 60c672e9b4d1..000000000000
--- a/pull_134.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur GDriveFS-0.14.3/gdrivefs/gdfs/gdfuse.py GDriveFS-0.14.3-new/gdrivefs/gdfs/gdfuse.py
---- GDriveFS-0.14.3/gdrivefs/gdfs/gdfuse.py	2015-10-18 16:09:54.708226894 -0600
-+++ GDriveFS-0.14.3-new/gdrivefs/gdfs/gdfuse.py	2015-10-18 16:15:17.431235540 -0600
-@@ -7,6 +7,7 @@
- import atexit
- import resource
- import pprint
-+import math
- 
- from errno import ENOENT, EIO, ENOTDIR, ENOTEMPTY, EPERM, EEXIST
- from fuse import FUSE, Operations, FuseOSError, c_statvfs, fuse_get_context, \
-@@ -161,6 +162,8 @@
-             stat_result["st_mode"] = (stat.S_IFREG | effective_permission)
-             stat_result["st_nlink"] = 1
- 
-+        stat_result["st_blocks"]   = int(math.ceil(float(stat_result["st_size"]) / 512.0))
-+
-         return stat_result
- 
-     @dec_hint(['raw_path', 'fh'])
diff --git a/pull_154_utf8.patch b/pull_154_utf8.patch
index 1c6e290c035c..66279be938d3 100644
--- a/pull_154_utf8.patch
+++ b/pull_154_utf8.patch
@@ -1,15 +1,3 @@
-diff -Naur GDriveFS-0.14.3-orig/gdrivefs/gdfs/opened_file.py GDriveFS-0.14.3/gdrivefs/gdfs/opened_file.py
---- GDriveFS-0.14.3-orig/gdrivefs/gdfs/opened_file.py	2016-03-20 20:40:04.593869779 -0600
-+++ GDriveFS-0.14.3/gdrivefs/gdfs/opened_file.py	2016-03-20 20:40:55.907851581 -0600
-@@ -197,7 +197,7 @@
-         self.__is_loaded = False
-         self.__is_dirty = False
- 
--        temp_filename = self.__entry_id.encode('ASCII')
-+        temp_filename = self.__entry_id.encode('utf8')
-         om = get_om()
-         self.__temp_filepath = os.path.join(om.temp_path, temp_filename)
- 
 diff -Naur GDriveFS-0.14.3-orig/gdrivefs/gdtool/normal_entry.py GDriveFS-0.14.3/gdrivefs/gdtool/normal_entry.py
 --- GDriveFS-0.14.3-orig/gdrivefs/gdtool/normal_entry.py	2016-03-20 20:40:04.593869779 -0600
 +++ GDriveFS-0.14.3/gdrivefs/gdtool/normal_entry.py	2016-03-20 20:41:27.672855022 -0600