patches: stop patching GHSidebarNav for nothing

buildAspenProject.sh

@@ -148,14 +148,6 @@ git clone git://github.com/mattrajca/DAVKit.git
 fi
 if ! [ -e GHSidebarNav ]; then
 git clone git://github.com/gresrun/GHSidebarNav.git
-cd GHSidebarNav
-git am ../../patches/ghsidebarnav/*.patch
-if [ $? -ne 0 ]; then
-git am --abort
-info "Applying the patches failed, aborting git-am"
-exit 1
-fi
-cd ..
 fi
 if ! [ -e upnpx ]; then
 UPNPXVERSION=1.2.4

patches/ghsidebarnav/0001-menu-cell-customization-for-VLC.patch

@@ -1,78 +0,0 @@
-From a603f51563889b0532e10592dcc087df4ef9e8e9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 10 Aug 2013 20:16:49 +0200
-Subject: [PATCH] menu cell: customization for VLC
-
----
- Demo/GHMenuCell.h |  2 ++
- Demo/GHMenuCell.m | 22 +++++++++++++---------
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/Demo/GHMenuCell.h b/Demo/GHMenuCell.h
-index dab09c8..e4c1df7 100644
---- a/Demo/GHMenuCell.h
-+++ b/Demo/GHMenuCell.h
-@@ -12,4 +12,6 @@ extern NSString const *kSidebarCellImageKey;
- 
- @interface GHMenuCell : UITableViewCell
- 
-+@property (nonatomic, strong) UIImageView *titleImageView;
-+
- @end
-diff --git a/Demo/GHMenuCell.m b/Demo/GHMenuCell.m
-index 1559b86..1a5d20e 100644
---- a/Demo/GHMenuCell.m
-+++ b/Demo/GHMenuCell.m
-@@ -21,27 +21,30 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
- 	if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
- 		self.clipsToBounds = YES;
--		
-+
- 		UIView *bgView = [[UIView alloc] init];
- 		bgView.backgroundColor = [UIColor colorWithRed:(38.0f/255.0f) green:(44.0f/255.0f) blue:(58.0f/255.0f) alpha:1.0f];
- 		self.selectedBackgroundView = bgView;
--		
-+
- 		self.imageView.contentMode = UIViewContentModeCenter;
--		
-+        self.titleImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 260.0f, 50.0f)];
-+        self.titleImageView.contentMode = UIViewContentModeCenter;
-+        [self.textLabel.superview addSubview:self.titleImageView];
-+
- 		self.textLabel.font = [UIFont fontWithName:@"Helvetica" size:([UIFont systemFontSize] * 1.2f)];
- 		self.textLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
- 		self.textLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
- 		self.textLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
--		
-+
- 		UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
- 		topLine.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(76.0f/255.0f) alpha:1.0f];
- 		[self.textLabel.superview addSubview:topLine];
--		
-+
- 		UIView *topLine2 = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 1.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
- 		topLine2.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(77.0f/255.0f) alpha:1.0f];
- 		[self.textLabel.superview addSubview:topLine2];
--		
--		UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 43.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-+
-+		UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 50.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
- 		bottomLine.backgroundColor = [UIColor colorWithRed:(40.0f/255.0f) green:(47.0f/255.0f) blue:(61.0f/255.0f) alpha:1.0f];
- 		[self.textLabel.superview addSubview:bottomLine];
- 	}
-@@ -51,8 +54,9 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- #pragma mark UIView
- - (void)layoutSubviews {
- 	[super layoutSubviews];
--	self.textLabel.frame = CGRectMake(50.0f, 0.0f, 200.0f, 43.0f);
--	self.imageView.frame = CGRectMake(0.0f, 0.0f, 50.0f, 43.0f);
-+	self.textLabel.frame = CGRectMake(50.0f, 0.0f, 200.0f, 50.0f);
-+    self.titleImageView.frame = CGRectMake(0.0f, 0.0f, 260.0f, 50.0f);
-+	self.imageView.frame = CGRectMake(0.0f, 0.0f, 50.0f, 50.0f);
- }
- 
- @end
-1.8.3.1 (Apple Git-46)
-

patches/ghsidebarnav/0002-Use-the-VLC-color-scheme.patch

@@ -1,46 +0,0 @@
-From 80c80c32b61f33fc8bfd6a1145e771ef0df576f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 17 Aug 2013 20:35:48 +0200
-Subject: [PATCH 2/2] Use the VLC color scheme
-
----
- Demo/GHMenuCell.m | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/Demo/GHMenuCell.m b/Demo/GHMenuCell.m
-index 1a5d20e..b6edf09 100644
---- a/Demo/GHMenuCell.m
-+++ b/Demo/GHMenuCell.m
-@@ -21,9 +21,10 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
- 	if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
- 		self.clipsToBounds = YES;
-+        self.backgroundColor = [UIColor colorWithRed:(43.0f/255.0f) green:(43.0f/255.0f) blue:(43.0f/255.0f) alpha:1.0f];
- 
- 		UIView *bgView = [[UIView alloc] init];
--		bgView.backgroundColor = [UIColor colorWithRed:(38.0f/255.0f) green:(44.0f/255.0f) blue:(58.0f/255.0f) alpha:1.0f];
-+		bgView.backgroundColor = [UIColor colorWithRed:(65.0f/255.0f) green:(65.0f/255.0f) blue:(65.0f/255.0f) alpha:1.0f];
- 		self.selectedBackgroundView = bgView;
- 
- 		self.imageView.contentMode = UIViewContentModeCenter;
-@@ -37,15 +38,11 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- 		self.textLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
- 
- 		UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
--		topLine.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(76.0f/255.0f) alpha:1.0f];
-+		topLine.backgroundColor = [UIColor colorWithRed:(16.0f/255.0f) green:(16.0f/255.0f) blue:(16.0f/255.0f) alpha:1.0f];
- 		[self.textLabel.superview addSubview:topLine];
- 
--		UIView *topLine2 = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 1.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
--		topLine2.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(77.0f/255.0f) alpha:1.0f];
--		[self.textLabel.superview addSubview:topLine2];
--
- 		UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 50.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
--		bottomLine.backgroundColor = [UIColor colorWithRed:(40.0f/255.0f) green:(47.0f/255.0f) blue:(61.0f/255.0f) alpha:1.0f];
-+		bottomLine.backgroundColor = [UIColor colorWithRed:(23.0f/255.0f) green:(23.0f/255.0f) blue:(23.0f/255.0f) alpha:1.0f];
- 		[self.textLabel.superview addSubview:bottomLine];
- 	}
- 	return self;
-1.8.3.1 (Apple Git-46)
-

patches/ghsidebarnav/0003-GHMenuCell-improve-rendering-of-overly-long-menu-ite.patch

@@ -1,29 +0,0 @@
-From c851177d8f2f8a69da85daf6b59e57b28944882a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sun, 18 Aug 2013 19:21:21 +0200
-Subject: [PATCH 3/3] GHMenuCell: improve rendering of overly long menu item
- names
-
----
- Demo/GHMenuCell.m | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Demo/GHMenuCell.m b/Demo/GHMenuCell.m
-index b6edf09..3111271 100644
---- a/Demo/GHMenuCell.m
-+++ b/Demo/GHMenuCell.m
-@@ -36,6 +36,11 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- 		self.textLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
- 		self.textLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
- 		self.textLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
-+        self.textLabel.adjustsFontSizeToFitWidth = YES;
-+        if ([self.textLabel respondsToSelector:@selector(setAdjustsLetterSpacingToFitWidth:)])
-+            self.textLabel.adjustsLetterSpacingToFitWidth = YES;
-+        self.textLabel.minimumFontSize = 9.0f;
-+        self.textLabel.lineBreakMode = UILineBreakModeTailTruncation;
- 
- 		UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
- 		topLine.backgroundColor = [UIColor colorWithRed:(16.0f/255.0f) green:(16.0f/255.0f) blue:(16.0f/255.0f) alpha:1.0f];
-1.8.3.1 (Apple Git-46)
-

patches/ghsidebarnav/0004-Fix-color-set.patch

@@ -1,34 +0,0 @@
-From e27bb10fa7d223381dcdb13cba9824cbb4cce2b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 24 Aug 2013 22:44:29 +0200
-Subject: [PATCH 4/4] Fix color set
-
----
- Demo/GHMenuCell.m | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Demo/GHMenuCell.m b/Demo/GHMenuCell.m
-index 3111271..0269b64 100644
---- a/Demo/GHMenuCell.m
-+++ b/Demo/GHMenuCell.m
-@@ -24,7 +24,7 @@ NSString const *kSidebarCellImageKey = @"CellImage";
-         self.backgroundColor = [UIColor colorWithRed:(43.0f/255.0f) green:(43.0f/255.0f) blue:(43.0f/255.0f) alpha:1.0f];
- 
- 		UIView *bgView = [[UIView alloc] init];
--		bgView.backgroundColor = [UIColor colorWithRed:(65.0f/255.0f) green:(65.0f/255.0f) blue:(65.0f/255.0f) alpha:1.0f];
-+		bgView.backgroundColor = [UIColor colorWithRed:0.1137 green:0.1137 blue:0.1137 alpha:1.0f];
- 		self.selectedBackgroundView = bgView;
- 
- 		self.imageView.contentMode = UIViewContentModeCenter;
-@@ -35,7 +35,7 @@ NSString const *kSidebarCellImageKey = @"CellImage";
- 		self.textLabel.font = [UIFont fontWithName:@"Helvetica" size:([UIFont systemFontSize] * 1.2f)];
- 		self.textLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
- 		self.textLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
--		self.textLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
-+		self.textLabel.textColor = [UIColor whiteColor];
-         self.textLabel.adjustsFontSizeToFitWidth = YES;
-         if ([self.textLabel respondsToSelector:@selector(setAdjustsLetterSpacingToFitWidth:)])
-             self.textLabel.adjustsLetterSpacingToFitWidth = YES;
-1.8.3.4 (Apple Git-47)
-