Commit a8359534 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update QuincyKit

parent 285cdf51
......@@ -64,7 +64,6 @@
[quincyManager setSubmissionURL:@"http://crash.videolan.org/crash_v200.php"];
[quincyManager setDelegate:self];
[quincyManager setShowAlwaysButton:YES];
[quincyManager setFeedbackActivated:YES];
/* clean caches on launch (since those are used for wifi upload only) */
NSArray *searchPaths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
......
......@@ -14,6 +14,7 @@ SKIPLIBVLCCOMPILATION=no
TESTEDVLCKITHASH=39e59da28
TESTEDMEDIALIBRARYKITHASH=b4a835ee7
TESTEDQUINCYKITHASH=f1d93b96b
usage()
{
......@@ -173,6 +174,8 @@ fi
if ! [ -e QuincyKit ]; then
git clone git://github.com/TheRealKerni/QuincyKit.git
cd QuincyKit
git checkout -B localAspenBranch ${TESTEDQUINCYKITHASH}
git branch --set-upstream-to=origin/master localAspenBranch
git am ../../patches/quincykit/*.patch
if [ $? -ne 0 ]; then
git am --abort
......
From 8e254a6f0677d868b27f14241c29cad9b88e89cc Mon Sep 17 00:00:00 2001
From 20b7b86cb1fa8e221ab001de520397eeec4734d1 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
Date: Thu, 23 Jan 2014 16:18:50 +0100
Subject: [PATCH 1/3] Fix compilation in the VLC context
---
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(-)
client/iOS/BWCrashReportTextFormatter.h | 2 +-
client/iOS/BWCrashReportTextFormatter.m | 2 +-
client/iOS/BWQuincyManager.h | 2 +-
client/iOS/BWQuincyManager.m | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/iOS/BWCrashReportTextFormatter.h b/client/iOS/BWCrashReportTextFormatter.h
index 4088994..4319a85 100644
index 207d9cd..86d63f0 100644
--- a/client/iOS/BWCrashReportTextFormatter.h
+++ b/client/iOS/BWCrashReportTextFormatter.h
@@ -34,7 +34,7 @@
......@@ -21,10 +21,10 @@ index 4088994..4319a85 100644
-#import <CrashReporter/PLCrashReport.h>
+#import "PLCrashReport.h"
@interface BWCrashReportTextFormatter : NSObject {
// Dictionary keys for array elements returned by arrayOfAppUUIDsForCrashReport:
#ifndef kBWBinaryImageKeyUUID
diff --git a/client/iOS/BWCrashReportTextFormatter.m b/client/iOS/BWCrashReportTextFormatter.m
index cb89a63..79e4569 100644
index 3607510..76204ce 100644
--- a/client/iOS/BWCrashReportTextFormatter.m
+++ b/client/iOS/BWCrashReportTextFormatter.m
@@ -31,7 +31,7 @@
......@@ -36,11 +36,24 @@ index cb89a63..79e4569 100644
#import "BWCrashReportTextFormatter.h"
diff --git a/client/iOS/BWQuincyManager.h b/client/iOS/BWQuincyManager.h
index dce403d..45692e9 100644
--- a/client/iOS/BWQuincyManager.h
+++ b/client/iOS/BWQuincyManager.h
@@ -30,7 +30,7 @@
#import <Foundation/Foundation.h>
-#import <CrashReporter/CrashReporter.h>
+#import "CrashReporter.h"
#import "BWQuincyManagerDelegate.h"
diff --git a/client/iOS/BWQuincyManager.m b/client/iOS/BWQuincyManager.m
index 04b56ff..e025f35 100644
index db08b2f..8fa3200 100644
--- a/client/iOS/BWQuincyManager.m
+++ b/client/iOS/BWQuincyManager.m
@@ -27,7 +27,7 @@
@@ -28,7 +28,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
......@@ -48,33 +61,7 @@ index 04b56ff..e025f35 100644
+#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)
From 9d3b2a10d5f6a723d49edaf019c62ad97e8a5763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 23 Jan 2014 16:30:38 +0100
Subject: [PATCH 2/3] Upgrade default target
---
client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
index 29e2914..7a8adfe 100644
--- a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
+++ b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
1E584C1B1883306000C4D800 /* BWQuincyManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E584C1A1883306000C4D800 /* BWQuincyManagerDelegate.h */; };
36892BF0145EC96A0036932D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36892BEF145EC96A0036932D /* Foundation.framework */; };
- 36908F20145ECB090070379E /* CrashReporter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36908F1F145ECB090070379E /* CrashReporter.framework */; };
36908F23145ECB2E0070379E /* BWQuincyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 36908F22145ECB2E0070379E /* BWQuincyManager.m */; };
36908F25145ECB370070379E /* BWQuincyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 36908F24145ECB370070379E /* BWQuincyManager.h */; settings = {ATTRIBUTES = (); }; };
A04977691602AF6600DDF6BF /* BWCrashReportTextFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = A04977671602AF6600DDF6BF /* BWCrashReportTextFormatter.h */; };
@@ -20,7 +19,6 @@
1E584C1A1883306000C4D800 /* BWQuincyManagerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BWQuincyManagerDelegate.h; path = ../BWQuincyManagerDelegate.h; sourceTree = "<group>"; };
36892BEC145EC96A0036932D /* libQuincyLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libQuincyLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
36892BEF145EC96A0036932D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
- 36908F1F145ECB090070379E /* CrashReporter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CrashReporter.framework; path = ../CrashReporter.framework; sourceTree = "<group>"; };
36908F22145ECB2E0070379E /* BWQuincyManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BWQuincyManager.m; path = ../BWQuincyManager.m; sourceTree = "<group>"; };
36908F24145ECB370070379E /* BWQuincyManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BWQuincyManager.h; path = ../BWQuincyManager.h; sourceTree = "<group>"; };
A04977671602AF6600DDF6BF /* BWCrashReportTextFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BWCrashReportTextFormatter.h; path = ../BWCrashReportTextFormatter.h; sourceTree = "<group>"; };
@@ -32,7 +30,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 36908F20145ECB090070379E /* CrashReporter.framework in Frameworks */,
36892BF0145EC96A0036932D /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -60,7 +57,6 @@
36892BEE145EC96A0036932D /* Frameworks */ = {
isa = PBXGroup;
children = (
- 36908F1F145ECB090070379E /* CrashReporter.framework */,
36892BEF145EC96A0036932D /* Foundation.framework */,
);
name = Frameworks;
@@ -195,6 +191,7 @@
36892BFA145EC96B0036932D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/QuincyLib.dst;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -203,6 +200,11 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ "/Applications/Xcode51-Beta4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+ "\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
+ );
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
@@ -211,6 +213,7 @@
36892BFB145EC96B0036932D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/QuincyLib.dst;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -219,6 +222,11 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ "/Applications/Xcode51-Beta4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+ "\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
+ );
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
--
1.8.3.4 (Apple Git-47)
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)
From 61f5d64f29605b26b7a1c2fde9341b6164bbf646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 8 Jan 2014 16:45:54 +0100
Subject: [PATCH 4/4] Fix russian l10n issue
---
client/iOS/Quincy.bundle/ru.lproj/Quincy.strings | Bin 3672 -> 3750 bytes
.../Quincy.bundle/ru.lproj/QuincyAlternate.strings | Bin 3672 -> 3750 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/client/iOS/Quincy.bundle/ru.lproj/Quincy.strings b/client/iOS/Quincy.bundle/ru.lproj/Quincy.strings
index 139aa9ce1ed24a9fa84e05aff7675f8ff04b87ab..e135dc38d71a09f12966b051d69194ac0c3ca825 100755
GIT binary patch
delta 108
zcmca1vrKkF7TaVUPA=hKhE#?;h7^V%AYH(a&rrlrGC7lNI!KNkDmR&vy&uGvb^*%g
dF_bW1)ANu~e)1{yO+a;g>`-$yS99ED1pvf58{Gf^
delta 58
zcmZ1`dqZYJ7Te?wwrQNf45<ux3@Ho>ll9sAg<Tl(fjo7F5(WhZsLbStjPjG2I5urQ
I#c_uf0N@S~TmS$7
diff --git a/client/iOS/Quincy.bundle/ru.lproj/QuincyAlternate.strings b/client/iOS/Quincy.bundle/ru.lproj/QuincyAlternate.strings
index 139aa9ce1ed24a9fa84e05aff7675f8ff04b87ab..e135dc38d71a09f12966b051d69194ac0c3ca825 100755
GIT binary patch
delta 108
zcmca1vrKkF7TaVUPA=hKhE#?;h7^V%AYH(a&rrlrGC7lNI!KNkDmR&vy&uGvb^*%g
dF_bW1)ANu~e)1{yO+a;g>`-$yS99ED1pvf58{Gf^
delta 58
zcmZ1`dqZYJ7Te?wwrQNf45<ux3@Ho>ll9sAg<Tl(fjo7F5(WhZsLbStjPjG2I5urQ
I#c_uf0N@S~TmS$7
--
1.8.3.4 (Apple Git-47)
From 2995fa6f6e1dbe75f81c2303216c3091aed20ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 15 Jan 2014 15:56:43 +0100
Subject: [PATCH 5/5] Upgrade default target
---
client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
index df75985..6daa627 100644
--- a/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
+++ b/client/iOS/QuincyLib/QuincyLib.xcodeproj/project.pbxproj
@@ -189,6 +189,7 @@
36892BFA145EC96B0036932D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/QuincyLib.dst;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -201,6 +202,7 @@
"$(inherited)",
"\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
);
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -210,6 +212,7 @@
36892BFB145EC96B0036932D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/QuincyLib.dst;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -222,6 +225,7 @@
"$(inherited)",
"\"$(SRCROOT)/../../../../PLCrashReporter/Source\"",
);
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
--
1.8.3.4 (Apple Git-47)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment