瀏覽代碼

Fetch and Compile PLCrashReporter and QuincyKit

Felix Paul Kühne 11 年之前
父節點
當前提交
28ae9e6ac0

+ 1 - 1
Sources/VLC for iOS-Info.plist

@@ -174,7 +174,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2-git</string>
+	<string>2.2-rc1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

+ 40 - 0
compileVLCforiOS.sh

@@ -159,6 +159,28 @@ git clone git://github.com/mattrajca/DAVKit.git
 else
 cd DAVKit && git pull --rebase && cd ..
 fi
+if ! [ -e PLCrashReporter ]; then
+git clone https://opensource.plausible.coop/stash/scm/plcr/plcrashreporter.git PLCrashReporter
+cd PLCrashReporter
+git am ../../patches/plcrashreporter/*.patch
+if [ $? -ne 0 ]; then
+git am --abort
+info "Applying the patches failed, aborting git-am"
+exit 1
+fi
+cd ..
+fi
+if ! [ -e QuincyKit ]; then
+git clone git://github.com/TheRealKerni/QuincyKit.git
+cd QuincyKit
+git am ../../patches/quincykit/*.patch
+if [ $? -ne 0 ]; then
+git am --abort
+info "Applying the patches failed, aborting git-am"
+exit 1
+fi
+cd ..
+fi
 if ! [ -e GDrive ]; then
 svn checkout http://google-api-objectivec-client.googlecode.com/svn/trunk/Source GDrive
 else
@@ -218,6 +240,8 @@ framework_build="${aspen_root_dir}/ImportedSources/VLCKit/${xcbuilddir}"
 mlkit_build="${aspen_root_dir}/ImportedSources/MediaLibraryKit/${xcbuilddir}"
 upnpx_build="${aspen_root_dir}/ImportedSources/upnpx/projects/xcode4/upnpx/${xcbuilddir}"
 gtl_build="${aspen_root_dir}/ImportedSources/GDrive/${xcbuilddir}"
+plcrashreporter_build="${aspen_root_dir}/ImportedSources/PLCrashReporter/${xcbuilddir}"
+quincykit_build="${aspen_root_dir}/ImportedSources/QuincyKit/client/iOS/QuincyLib/${xcbuilddir}"
 
 spopd #ImportedSources
 
@@ -225,6 +249,8 @@ ln -sf ${framework_build} External/MobileVLCKit
 ln -sf ${mlkit_build} External/MediaLibraryKit
 ln -sf ${upnpx_build} External/upnpx
 ln -sf ${gtl_build} External/gtl
+ln -sf ${plcrashreporter_build} External/PLCrashReporter
+ln -sf ${quincykit_build} External/QuincyKit
 
 #
 # Build time
@@ -268,6 +294,20 @@ spushd GDrive
 buildxcodeproj GTL "GTLTouchStaticLib"
 spopd
 
+spushd PLCrashReporter
+if [ "$PLATFORM" = "iphonesimulator" ]; then
+    buildxcodeproj CrashReporter "CrashReporter-iOS-Simulator"
+else
+    buildxcodeproj CrashReporter "CrashReporter-iOS-Device"
+fi
+spopd
+
+spushd QuincyKit/client/iOS/QuincyLib
+buildxcodeproj QuincyLib
+spopd
+
+exit
+
 spopd # ImportedSources
 
 

+ 32 - 0
patches/plcrashreporter/0001-Don-t-use-werror.patch

@@ -0,0 +1,32 @@
+From 1688bbeee3a602033e85e7ea9ae87c367d666e31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Sun, 15 Dec 2013 17:04:08 +0100
+Subject: [PATCH 1/2] Don't use -werror
+
+---
+ CrashReporter.xcodeproj/project.pbxproj | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj
+index 868de19..a7db131 100644
+--- a/CrashReporter.xcodeproj/project.pbxproj
++++ b/CrashReporter.xcodeproj/project.pbxproj
+@@ -4360,7 +4360,6 @@
+ 				VALID_ARCHS = "i386 ppc armv7 armv7s armv6 x86_64 arm64";
+ 				WARNING_CFLAGS = (
+ 					"-Wall",
+-					"-Werror",
+ 					"-Wno-shorten-64-to-32",
+ 				);
+ 			};
+@@ -4391,7 +4390,6 @@
+ 				VALID_ARCHS = "i386 ppc armv7 armv7s armv6 x86_64 arm64";
+ 				WARNING_CFLAGS = (
+ 					"-Wall",
+-					"-Werror",
+ 					"-Wno-shorten-64-to-32",
+ 				);
+ 			};
+-- 
+1.8.3.4 (Apple Git-47)
+

+ 158 - 0
patches/plcrashreporter/0002-Fix-linking-withhin-ios.git.patch

@@ -0,0 +1,158 @@
+From 374bdf801f450cce67ac729baecadbf73af880f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Sun, 15 Dec 2013 17:38:24 +0100
+Subject: [PATCH 2/2] Fix linking withhin ios.git
+
+---
+ CrashReporter.xcodeproj/project.pbxproj | 36 ++++++++++++++++-----------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj
+index a7db131..b371cbf 100644
+--- a/CrashReporter.xcodeproj/project.pbxproj
++++ b/CrashReporter.xcodeproj/project.pbxproj
+@@ -108,9 +108,9 @@
+ 		052951F01696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto in Sources */ = {isa = PBXBuildFile; fileRef = 052951EE1696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto */; };
+ 		052951F11696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto in Sources */ = {isa = PBXBuildFile; fileRef = 052951EE1696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto */; };
+ 		052A45DA1363542800987004 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 05F40CF10EF7AC0E008050CF /* main.m */; };
+-		052A46271363553A00987004 /* libCrashReporter-iphoneos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31520EE936A9000FDE88 /* libCrashReporter-iphoneos.a */; };
++		052A46271363553A00987004 /* libCrashReporter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31520EE936A9000FDE88 /* libCrashReporter.a */; };
+ 		052A4649136355FD00987004 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 05F40CF10EF7AC0E008050CF /* main.m */; };
+-		052A46561363561B00987004 /* libCrashReporter-iphonesimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31630EE93905000FDE88 /* libCrashReporter-iphonesimulator.a */; };
++		052A46561363561B00987004 /* libCrashReporter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31630EE93905000FDE88 /* libCrashReporter.a */; };
+ 		052A46BE1363650100987004 /* PLCrashAsyncImageList.h in Headers */ = {isa = PBXBuildFile; fileRef = 052A46BC1363650100987004 /* PLCrashAsyncImageList.h */; };
+ 		052A46BF1363650100987004 /* PLCrashAsyncImageList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 052A46BD1363650100987004 /* PLCrashAsyncImageList.cpp */; };
+ 		052A46C01363650100987004 /* PLCrashAsyncImageList.h in Headers */ = {isa = PBXBuildFile; fileRef = 052A46BC1363650100987004 /* PLCrashAsyncImageList.h */; };
+@@ -166,7 +166,7 @@
+ 		05507A531784DEE4009D5168 /* unwind_test_x86_frame.S in Sources */ = {isa = PBXBuildFile; fileRef = 05507A521784DEE4009D5168 /* unwind_test_x86_frame.S */; settings = {COMPILER_FLAGS = "-fexceptions"; }; };
+ 		05507A541784DEE4009D5168 /* unwind_test_x86_frame.S in Sources */ = {isa = PBXBuildFile; fileRef = 05507A521784DEE4009D5168 /* unwind_test_x86_frame.S */; };
+ 		05507A551784DEE4009D5168 /* unwind_test_x86_frame.S in Sources */ = {isa = PBXBuildFile; fileRef = 05507A521784DEE4009D5168 /* unwind_test_x86_frame.S */; };
+-		0550A1100EECFEDC0037F7C3 /* libCrashReporter-iphonesimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31630EE93905000FDE88 /* libCrashReporter-iphonesimulator.a */; };
++		0550A1100EECFEDC0037F7C3 /* libCrashReporter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31630EE93905000FDE88 /* libCrashReporter.a */; };
+ 		05654F770EFA5B54004283F5 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05654F760EFA5B54004283F5 /* CoreServices.framework */; };
+ 		05654F780EFA5B54004283F5 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05654F760EFA5B54004283F5 /* CoreServices.framework */; };
+ 		05654F790EFA5B54004283F5 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05654F760EFA5B54004283F5 /* CoreServices.framework */; };
+@@ -187,7 +187,7 @@
+ 		0573B4311681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0573B42B1681098E00395F2A /* PLCrashMachExceptionServer.m */; };
+ 		0573B4321681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0573B42B1681098E00395F2A /* PLCrashMachExceptionServer.m */; };
+ 		0573B4331681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0573B42B1681098E00395F2A /* PLCrashMachExceptionServer.m */; };
+-		0573B43416810AB400395F2A /* libCrashReporter-iphoneos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31520EE936A9000FDE88 /* libCrashReporter-iphoneos.a */; };
++		0573B43416810AB400395F2A /* libCrashReporter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 05CD31520EE936A9000FDE88 /* libCrashReporter.a */; };
+ 		0573B4481681107F00395F2A /* PLCrashReportRegisterInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E54E16765A0200B39833 /* PLCrashReportRegisterInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 		0573B4491681108200395F2A /* PLCrashReportStackFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E5431676598200B39833 /* PLCrashReportStackFrameInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 		0573B44A1681108500395F2A /* PLCrashReportSymbolInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E55916765D0200B39833 /* PLCrashReportSymbolInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+@@ -1230,8 +1230,8 @@
+ 		05C76DC6176FBAF300E9B10D /* PLCrashAsyncDwarfCFAState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PLCrashAsyncDwarfCFAState.cpp; sourceTree = "<group>"; };
+ 		05C76DC7176FBAF300E9B10D /* PLCrashAsyncDwarfCFAState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = PLCrashAsyncDwarfCFAState.hpp; sourceTree = "<group>"; };
+ 		05C76DD3176FBC1E00E9B10D /* PLCrashAsyncDwarfCFAStateTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PLCrashAsyncDwarfCFAStateTests.mm; sourceTree = "<group>"; };
+-		05CD31520EE936A9000FDE88 /* libCrashReporter-iphoneos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCrashReporter-iphoneos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+-		05CD31630EE93905000FDE88 /* libCrashReporter-iphonesimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCrashReporter-iphonesimulator.a"; sourceTree = BUILT_PRODUCTS_DIR; };
++		05CD31520EE936A9000FDE88 /* libCrashReporter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCrashReporter.a; sourceTree = BUILT_PRODUCTS_DIR; };
++		05CD31630EE93905000FDE88 /* libCrashReporter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCrashReporter.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		05CD31890EE93A90000FDE88 /* CrashReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrashReporter.h; sourceTree = "<group>"; };
+ 		05CD318A0EE93A90000FDE88 /* CrashReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CrashReporter.m; sourceTree = "<group>"; };
+ 		05CD32690EE93DC3000FDE88 /* Tests-MacOSX.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests-MacOSX.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
+@@ -1361,7 +1361,7 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+-				052A46271363553A00987004 /* libCrashReporter-iphoneos.a in Frameworks */,
++				052A46271363553A00987004 /* libCrashReporter.a in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+@@ -1369,7 +1369,7 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+-				052A46561363561B00987004 /* libCrashReporter-iphonesimulator.a in Frameworks */,
++				052A46561363561B00987004 /* libCrashReporter.a in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+@@ -1407,7 +1407,7 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+-				0550A1100EECFEDC0037F7C3 /* libCrashReporter-iphonesimulator.a in Frameworks */,
++				0550A1100EECFEDC0037F7C3 /* libCrashReporter.a in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+@@ -1415,7 +1415,7 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+-				0573B43416810AB400395F2A /* libCrashReporter-iphoneos.a in Frameworks */,
++				0573B43416810AB400395F2A /* libCrashReporter.a in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+@@ -1459,8 +1459,8 @@
+ 			isa = PBXGroup;
+ 			children = (
+ 				8DC2EF5B0486A6940098B216 /* CrashReporter.framework */,
+-				05CD31520EE936A9000FDE88 /* libCrashReporter-iphoneos.a */,
+-				05CD31630EE93905000FDE88 /* libCrashReporter-iphonesimulator.a */,
++				05CD31520EE936A9000FDE88 /* libCrashReporter.a */,
++				05CD31630EE93905000FDE88 /* libCrashReporter.a */,
+ 				05CD32690EE93DC3000FDE88 /* Tests-MacOSX.octest */,
+ 				05CD32A90EE94062000FDE88 /* Tests-iOS-Simulator.app */,
+ 				05CD33240EE94439000FDE88 /* Tests-iOS-Device.app */,
+@@ -2509,7 +2509,7 @@
+ 			);
+ 			name = "CrashReporter-iOS-Device";
+ 			productName = "CrashReporter-iPhoneOS";
+-			productReference = 05CD31520EE936A9000FDE88 /* libCrashReporter-iphoneos.a */;
++			productReference = 05CD31520EE936A9000FDE88 /* libCrashReporter.a */;
+ 			productType = "com.apple.product-type.library.static";
+ 		};
+ 		05CD31620EE93905000FDE88 /* CrashReporter-iOS-Simulator */ = {
+@@ -2527,7 +2527,7 @@
+ 			);
+ 			name = "CrashReporter-iOS-Simulator";
+ 			productName = "CrashReporter-iPhoneSimulator";
+-			productReference = 05CD31630EE93905000FDE88 /* libCrashReporter-iphonesimulator.a */;
++			productReference = 05CD31630EE93905000FDE88 /* libCrashReporter.a */;
+ 			productType = "com.apple.product-type.library.static";
+ 		};
+ 		05CD32680EE93DC3000FDE88 /* Tests-MacOSX */ = {
+@@ -3853,7 +3853,7 @@
+ 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
+ 				MACH_O_TYPE = staticlib;
+ 				ONLY_ACTIVE_ARCH = NO;
+-				PRODUCT_NAME = "CrashReporter${EFFECTIVE_PLATFORM_NAME}";
++				PRODUCT_NAME = CrashReporter;
+ 				SDKROOT = iphoneos;
+ 				SKIP_INSTALL = NO;
+ 				TARGETED_DEVICE_FAMILY = "1,2";
+@@ -3874,7 +3874,7 @@
+ 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
+ 				MACH_O_TYPE = staticlib;
+ 				ONLY_ACTIVE_ARCH = NO;
+-				PRODUCT_NAME = "CrashReporter${EFFECTIVE_PLATFORM_NAME}";
++				PRODUCT_NAME = CrashReporter;
+ 				SDKROOT = iphoneos;
+ 				SKIP_INSTALL = NO;
+ 				TARGETED_DEVICE_FAMILY = "1,2";
+@@ -3896,7 +3896,7 @@
+ 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ 				MACH_O_TYPE = staticlib;
+ 				ONLY_ACTIVE_ARCH = NO;
+-				PRODUCT_NAME = "CrashReporter${EFFECTIVE_PLATFORM_NAME}";
++				PRODUCT_NAME = CrashReporter;
+ 				SDKROOT = iphonesimulator;
+ 				SKIP_INSTALL = NO;
+ 			};
+@@ -3914,7 +3914,7 @@
+ 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ 				MACH_O_TYPE = staticlib;
+ 				ONLY_ACTIVE_ARCH = NO;
+-				PRODUCT_NAME = "CrashReporter${EFFECTIVE_PLATFORM_NAME}";
++				PRODUCT_NAME = CrashReporter;
+ 				SDKROOT = iphonesimulator;
+ 				SKIP_INSTALL = NO;
+ 				ZERO_LINK = NO;
+-- 
+1.8.3.4 (Apple Git-47)
+

文件差異過大導致無法顯示
+ 7139 - 0
patches/quincykit/0001-Remove-included-CrashReporter.framework-binary.patch


+ 80 - 0
patches/quincykit/0002-Fix-header-lookup-within-ios.git.patch

@@ -0,0 +1,80 @@
+From 8e254a6f0677d868b27f14241c29cad9b88e89cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Sun, 15 Dec 2013 17:27:12 +0100
+Subject: [PATCH 2/3] Fix header lookup within ios.git
+
+---
+ client/iOS/BWCrashReportTextFormatter.h                  | 2 +-
+ client/iOS/BWCrashReportTextFormatter.m                  | 2 +-
+ client/iOS/BWQuincyManager.m                             | 2 +-
+ client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj | 8 ++++++++
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/client/iOS/BWCrashReportTextFormatter.h b/client/iOS/BWCrashReportTextFormatter.h
+index 4088994..4319a85 100644
+--- a/client/iOS/BWCrashReportTextFormatter.h
++++ b/client/iOS/BWCrashReportTextFormatter.h
+@@ -34,7 +34,7 @@
+ 
+ #import <Foundation/Foundation.h>
+ 
+-#import <CrashReporter/PLCrashReport.h>
++#import "PLCrashReport.h"
+ 
+ 
+ @interface BWCrashReportTextFormatter : NSObject {
+diff --git a/client/iOS/BWCrashReportTextFormatter.m b/client/iOS/BWCrashReportTextFormatter.m
+index cb89a63..79e4569 100644
+--- a/client/iOS/BWCrashReportTextFormatter.m
++++ b/client/iOS/BWCrashReportTextFormatter.m
+@@ -31,7 +31,7 @@
+  * OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
+-#import <CrashReporter/CrashReporter.h>
++#import "CrashReporter.h"
+ 
+ #import "BWCrashReportTextFormatter.h"
+ 
+diff --git a/client/iOS/BWQuincyManager.m b/client/iOS/BWQuincyManager.m
+index 04b56ff..e025f35 100644
+--- a/client/iOS/BWQuincyManager.m
++++ b/client/iOS/BWQuincyManager.m
+@@ -27,7 +27,7 @@
+  * OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
+-#import <CrashReporter/CrashReporter.h>
++#import "CrashReporter.h"
+ #import <SystemConfiguration/SystemConfiguration.h>
+ #import <UIKit/UIKit.h>
+ #import "BWQuincyManager.h"
+diff --git a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
+index 11fb230..df75985 100644
+--- a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
++++ b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
+@@ -197,6 +197,10 @@
+ 				);
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "";
++				HEADER_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
++				);
+ 				OTHER_LDFLAGS = "-ObjC";
+ 				PRODUCT_NAME = "$(TARGET_NAME)";
+ 				SKIP_INSTALL = YES;
+@@ -214,6 +218,10 @@
+ 				);
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "";
++				HEADER_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
++				);
+ 				OTHER_LDFLAGS = "-ObjC";
+ 				PRODUCT_NAME = "$(TARGET_NAME)";
+ 				SKIP_INSTALL = YES;
+-- 
+1.8.3.4 (Apple Git-47)
+

+ 43 - 0
patches/quincykit/0003-Update-BWCrashReportTextFormatter-for-new-PLCrashRep.patch

@@ -0,0 +1,43 @@
+From 9e1f00db0c5db45a5c1047445955db97bfde95db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Sun, 15 Dec 2013 17:27:51 +0100
+Subject: [PATCH 3/3] Update BWCrashReportTextFormatter for new PLCrashReporter
+
+---
+ client/iOS/BWCrashReportTextFormatter.m | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/client/iOS/BWCrashReportTextFormatter.m b/client/iOS/BWCrashReportTextFormatter.m
+index 79e4569..ceb725b 100644
+--- a/client/iOS/BWCrashReportTextFormatter.m
++++ b/client/iOS/BWCrashReportTextFormatter.m
+@@ -148,7 +148,6 @@ static NSInteger binaryImageSort(id binary1, id binary2, void *context) {
+             switch (report.systemInfo.architecture) {
+                 case PLCrashReportArchitectureARMv6:
+                 case PLCrashReportArchitectureARMv7:
+-                case PLCrashReportArchitectureARMv7s:
+                     codeType = @"ARM";
+                     lp64 = false;
+                     break;
+@@ -173,17 +172,11 @@ static NSInteger binaryImageSort(id binary1, id binary2, void *context) {
+     }
+ 
+     {
+-        NSString *reportGUID = @"[TODO]";
+-        if ([report respondsToSelector:@selector(reportInfo)]) {
+-            if (report.hasReportInfo && report.reportInfo.reportGUID != nil)
+-                reportGUID = report.reportInfo.reportGUID;
+-        }
+-      
++
+         NSString *hardwareModel = @"???";
+         if (report.hasMachineInfo && report.machineInfo.modelName != nil)
+             hardwareModel = report.machineInfo.modelName;
+ 
+-        [text appendFormat: @"Incident Identifier: %@\n", reportGUID];
+         [text appendFormat: @"CrashReporter Key:   [TODO]\n"];
+         [text appendFormat: @"Hardware Model:      %@\n", hardwareModel];
+     }
+-- 
+1.8.3.4 (Apple Git-47)
+