Przeglądaj źródła

fix onedrive patches

Felix Paul Kühne 10 lat temu
rodzic
commit
83e77b79df

+ 1 - 1
compileVLCforiOS.sh

@@ -176,7 +176,7 @@ rm -rf __MACOSX
 fi
 if ! [ -e OneDrive ]; then
 git clone git://github.com/liveservices/LiveSDK-for-iOS.git OneDrive
-cd OneDrive && git am ../../patches/onedrive/0001-Compile-ARMv7s-slice.patch && cd ..
+cd OneDrive && git am ../../patches/onedrive/*.patch && cd ..
 else
 cd OneDrive && git pull --rebase && cd ..
 fi

+ 6 - 6
patches/onedrive/0001-Compile-ARMv7s-slice.patch

@@ -1,17 +1,17 @@
-From d6627f3cbe220eca3f3f2bf9da61274d10da15c3 Mon Sep 17 00:00:00 2001
+From 92383705dafbe1e1bce50de6613b5ed7ccbc780b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 8 Jan 2015 00:44:58 +0100
-Subject: [PATCH] Compile ARMv7s slice
+Subject: [PATCH 1/3] Compile ARMv7s slice
 
 ---
  src/LiveSDK.xcodeproj/project.pbxproj | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/LiveSDK.xcodeproj/project.pbxproj b/src/LiveSDK.xcodeproj/project.pbxproj
-index 40e4970..48ddcfc 100755
+index 24c1677..fd45f68 100755
 --- a/src/LiveSDK.xcodeproj/project.pbxproj
 +++ b/src/LiveSDK.xcodeproj/project.pbxproj
-@@ -923,7 +923,7 @@
+@@ -656,7 +656,7 @@
  				ONLY_ACTIVE_ARCH = NO;
  				PRODUCT_NAME = "$(TARGET_NAME)";
  				SDKROOT = iphoneos;
@@ -20,7 +20,7 @@ index 40e4970..48ddcfc 100755
  				WRAPPER_EXTENSION = framework;
  			};
  			name = Debug;
-@@ -946,7 +946,7 @@
+@@ -679,7 +679,7 @@
  				ONLY_ACTIVE_ARCH = NO;
  				PRODUCT_NAME = "$(TARGET_NAME)";
  				SDKROOT = iphoneos;
@@ -30,5 +30,5 @@ index 40e4970..48ddcfc 100755
  			};
  			name = Release;
 -- 
-1.9.3 (Apple Git-50)
+2.3.8 (Apple Git-58)
 

+ 2 - 2
patches/onedrive/0004-Add-our-own-static-library-target.patch

@@ -1,7 +1,7 @@
 From 18efb2ac1a857d3abbeefc3dbc08fb4a0a91be70 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 28 Jul 2015 10:32:55 +0200
-Subject: [PATCH] Add our own static library target
+Subject: [PATCH 2/3] Add our own static library target
 
 ---
  src/LiveSDK.xcodeproj/project.pbxproj | 162 ++++++++++++++++++++++++++++++++++
@@ -260,5 +260,5 @@ index fd45f68..c4772ce 100755
  	};
  	rootObject = 5297DDD0145E102B005B463E /* Project object */;
 -- 
-2.3.2 (Apple Git-55)
+2.3.8 (Apple Git-58)
 

+ 3 - 3
patches/onedrive/0002-NavigationBar-UI-fixes.patch

@@ -1,7 +1,7 @@
-From 82221b97a7f0c35b5915471d21a6d1d88eba1e2e Mon Sep 17 00:00:00 2001
+From 0386b62ffade3bf4b65037cee030477175fb98c5 Mon Sep 17 00:00:00 2001
 From: Tobias Conradi <videolan@tobias-conradi.de>
 Date: Wed, 29 Apr 2015 22:19:20 +0200
-Subject: [PATCH] NavigationBar UI fixes
+Subject: [PATCH 3/3] NavigationBar UI fixes
 
 ---
  src/LiveSDK/Library/Internal/LiveAuthDialog.m | 25 ++++++-------------------
@@ -44,5 +44,5 @@ index ea3eba2..162085e 100644
      NSURLRequest *requestObj = [NSURLRequest requestWithURL:_startUrl];
      [webView loadRequest:requestObj];    
 -- 
-2.2.1
+2.3.8 (Apple Git-58)
 

+ 0 - 47
patches/onedrive/0003-fix-archs.patch

@@ -1,48 +0,0 @@
-From b963dc19b26ee6e7b75a6774a8fe9cd74d224b38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Fri, 10 Jul 2015 18:48:10 +0200
-Subject: [PATCH] fix archs
-
----
- src/LiveSDK.xcodeproj/project.pbxproj | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/LiveSDK.xcodeproj/project.pbxproj b/src/LiveSDK.xcodeproj/project.pbxproj
-index fd45f68..48db850 100755
---- a/src/LiveSDK.xcodeproj/project.pbxproj
-+++ b/src/LiveSDK.xcodeproj/project.pbxproj
-@@ -508,8 +508,8 @@
- 			projectDirPath = "";
- 			projectRoot = "";
- 			targets = (
--				5297DDF3145E102B005B463E /* LiveSDKTests */,
- 				5285182D14727FE6009E8BD6 /* LiveSDK */,
-+				5297DDF3145E102B005B463E /* LiveSDKTests */,
- 			);
- 		};
- /* End PBXProject section */
-@@ -642,6 +642,10 @@
- 		5285183814727FE7009E8BD6 /* Debug */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				ARCHS = (
-+					"$(ARCHS_STANDARD)",
-+					armv7s,
-+				);
- 				DEAD_CODE_STRIPPING = NO;
- 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-@@ -664,6 +668,10 @@
- 		5285183914727FE7009E8BD6 /* Release */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				ARCHS = (
-+					"$(ARCHS_STANDARD)",
-+					armv7s,
-+				);
- 				DEAD_CODE_STRIPPING = NO;
- 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-2.4.4
-