浏览代码

Fix GDrive compilation until it is fixed upstream

Felix Paul Kühne 9 年之前
父节点
当前提交
3b4d6b13c6
共有 3 个文件被更改,包括 39 次插入0 次删除
  1. 3 0
      compileVLCforiOS.sh
  2. 18 0
      patches/gdrive/session-fetcher-objects.diff
  3. 18 0
      patches/gdrive/session-fetcher-top.diff

+ 3 - 0
compileVLCforiOS.sh

@@ -144,8 +144,11 @@ if ! [ -e GDrive ]; then
 svn checkout http://google-api-objectivec-client.googlecode.com/svn/trunk/Source GDrive
 cd GDrive
 patch -p0 < ../../patches/gdrive/fix-target.patch
+patch -p0 < ../../patches/gdrive/session-fetcher-top.diff
 cd ..
 cd GDrive/HTTPFetcher && patch -p0 < ../../../patches/gdrive/httpfetcher-compilation-fix.diff && cd ../..
+cd ..
+cd GDrive/Objects && patch -p0 < ../../../patches/gdrive/session-fetcher-objects.diff && cd ../..
 else
 cd GDrive && svn up && cd ..
 fi

+ 18 - 0
patches/gdrive/session-fetcher-objects.diff

@@ -0,0 +1,18 @@
+Index: GTLService.h
+===================================================================
+--- GTLService.h	(revision 457)
++++ GTLService.h	(working copy)
+@@ -30,13 +30,6 @@
+ // GTMSessionFetcher rather than the older GTMHTTPFetcher.  The session
+ // fetcher requires iOS 7/OS X 10.9 and supports out-of-process uploads.
+ 
+-#if (!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
+-  || (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
+-  #ifndef GTM_USE_SESSION_FETCHER
+-    #define GTM_USE_SESSION_FETCHER 1
+-  #endif
+-#endif
+-
+ #if !defined(GTL_USE_SESSION_FETCHER) && defined(GTM_USE_SESSION_FETCHER)
+   #define GTL_USE_SESSION_FETCHER GTM_USE_SESSION_FETCHER
+ #endif  // GTL_USE_SESSION_FETCHER

+ 18 - 0
patches/gdrive/session-fetcher-top.diff

@@ -0,0 +1,18 @@
+Index: Objects/GTLService.h
+===================================================================
+--- Objects/GTLService.h	(revision 457)
++++ Objects/GTLService.h	(working copy)
+@@ -30,13 +30,6 @@
+ // GTMSessionFetcher rather than the older GTMHTTPFetcher.  The session
+ // fetcher requires iOS 7/OS X 10.9 and supports out-of-process uploads.
+ 
+-#if (!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
+-  || (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
+-  #ifndef GTM_USE_SESSION_FETCHER
+-    #define GTM_USE_SESSION_FETCHER 1
+-  #endif
+-#endif
+-
+ #if !defined(GTL_USE_SESSION_FETCHER) && defined(GTM_USE_SESSION_FETCHER)
+   #define GTL_USE_SESSION_FETCHER GTM_USE_SESSION_FETCHER
+ #endif  // GTL_USE_SESSION_FETCHER