gdrive: simplify and fix target patching

compileVLCforiOS.sh

@@ -145,8 +145,7 @@ fi
 if ! [ -e GDrive ]; then
 svn checkout http://google-api-objectivec-client.googlecode.com/svn/trunk/Source GDrive
 cd GDrive
-patch -p0 < ../../patches/gdrive/upgrade-default-target.patch
-patch -p0 < ../../patches/gdrive/gtl-werror.patch
+patch -p0 < ../../patches/gdrive/fix-target.patch
 cd ..
 cd GDrive/HTTPFetcher && patch -p0 < ../../../patches/gdrive/httpfetcher-compilation-fix.diff && cd ../..
 else

patches/gdrive/fix-target.patch

@@ -0,0 +1,59 @@
+Index: GTL.xcodeproj/project.pbxproj
+===================================================================
+--- GTL.xcodeproj/project.pbxproj	(revision 451)
++++ GTL.xcodeproj/project.pbxproj	(working copy)
+@@ -1053,7 +1053,6 @@
+ 				SDKROOT = macosx;
+ 				WARNING_CFLAGS = (
+ 					"-Wall",
+-					"-Werror",
+ 					"-Wendif-labels",
+ 					"-Wnewline-eof",
+ 					"-Wfloat-equal",
+@@ -1095,7 +1094,6 @@
+ 				SDKROOT = macosx;
+ 				WARNING_CFLAGS = (
+ 					"-Wall",
+-					"-Werror",
+ 					"-Wendif-labels",
+ 					"-Wnewline-eof",
+ 					"-Wfloat-equal",
+@@ -1197,26 +1195,36 @@
+ 		4F1C6E101027B3CF00B46459 /* Debug */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+-				ARCHS = "$(ARCHS_STANDARD)";
++				ARCHS = (
++					"$(ARCHS_STANDARD)",
++					armv7s,
++				);
++				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ 				OTHER_CFLAGS = (
+ 					"$(inherited)",
+ 					"-DGTL_IPHONE=1",
+ 				);
+ 				PRODUCT_NAME = GTLTouchStaticLib;
+ 				SDKROOT = iphoneos;
++				SKIP_INSTALL = YES;
+ 			};
+ 			name = Debug;
+ 		};
+ 		4F1C6E111027B3CF00B46459 /* Release */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+-				ARCHS = "$(ARCHS_STANDARD)";
++				ARCHS = (
++					"$(ARCHS_STANDARD)",
++					armv7s,
++				);
++				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ 				OTHER_CFLAGS = (
+ 					"$(inherited)",
+ 					"-DGTL_IPHONE=1",
+ 				);
+ 				PRODUCT_NAME = GTLTouchStaticLib;
+ 				SDKROOT = iphoneos;
++				SKIP_INSTALL = YES;
+ 			};
+ 			name = Release;
+ 		};

patches/gdrive/gtl-werror.patch

@@ -1,20 +0,0 @@
-Index: GTL.xcodeproj/project.pbxproj
-===================================================================
---- GTL.xcodeproj/project.pbxproj	(revision 451)
-+++ GTL.xcodeproj/project.pbxproj	(working copy)
-@@ -1053,7 +1053,6 @@
- 				SDKROOT = macosx;
- 				WARNING_CFLAGS = (
- 					"-Wall",
--					"-Werror",
- 					"-Wendif-labels",
- 					"-Wnewline-eof",
- 					"-Wfloat-equal",
-@@ -1095,7 +1094,6 @@
- 				SDKROOT = macosx;
- 				WARNING_CFLAGS = (
- 					"-Wall",
--					"-Werror",
- 					"-Wendif-labels",
- 					"-Wnewline-eof",
- 					"-Wfloat-equal",

patches/gdrive/upgrade-default-target.patch

@@ -1,28 +0,0 @@
-Index: GTL.xcodeproj/project.pbxproj
-===================================================================
---- GTL.xcodeproj/project.pbxproj	(revision 426)
-+++ GTL.xcodeproj/project.pbxproj	(working copy)
-@@ -1197,7 +1197,10 @@
- 		4F1C6E101027B3CF00B46459 /* Debug */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
--				ARCHS = "$(ARCHS_STANDARD)";
-+				ARCHS = (
-+					"$(ARCHS_STANDARD)",
-+					armv7s,
-+				);
- 				OTHER_CFLAGS = (
- 					"$(inherited)",
- 					"-DGTL_IPHONE=1",
-@@ -1210,7 +1213,10 @@
- 		4F1C6E111027B3CF00B46459 /* Release */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
--				ARCHS = "$(ARCHS_STANDARD)";
-+				ARCHS = (
-+					"$(ARCHS_STANDARD)",
-+					armv7s,
-+				);
- 				OTHER_CFLAGS = (
- 					"$(inherited)",
- 					"-DGTL_IPHONE=1",