浏览代码

Remove InAppSettingsKit patch which was merged upstream

Felix Paul Kühne 11 年之前
父节点
当前提交
fc485ae98f
共有 2 个文件被更改,包括 2 次插入34 次删除
  1. 2 8
      compileVLCforiOS.sh
  2. 0 26
      patches/inappsettingskit/0001-Fix-iOS-7-appearance-issue.patch

+ 2 - 8
compileVLCforiOS.sh

@@ -252,14 +252,8 @@ rm -rf __MACOSX
 fi
 if ! [ -e InAppSettingsKit ]; then
 git clone git://github.com/futuretap/InAppSettingsKit.git
-cd InAppSettingsKit
-git am ../../patches/inappsettingskit/*.patch
-if [ $? -ne 0 ]; then
-git am --abort
-info "Applying the patches failed, aborting git-am"
-exit 1
-fi
-cd ..
+else
+cd WhiteRaccoon && git pull --rebase && cd ..
 fi
 fi
 

+ 0 - 26
patches/inappsettingskit/0001-Fix-iOS-7-appearance-issue.patch

@@ -1,27 +0,0 @@
-From d9a4ab2bea0bbc0d9fb81b4986107cdd0688f200 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 9 Jan 2014 22:36:44 +0100
-Subject: [PATCH] Fix iOS 7 appearance issue
-
----
- InAppSettingsKit/Controllers/IASKAppSettingsViewController.m | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
-index e2156f9..648fc30 100644
---- a/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
-+++ b/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
-@@ -458,8 +458,8 @@ CGRect IASKCGRectSwap(CGRect rect);
- 	} else {
- 		cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
- 	}
--	cell.textLabel.minimumFontSize = kIASKMinimumFontSize;
--	cell.detailTextLabel.minimumFontSize = kIASKMinimumFontSize;
-+	cell.textLabel.minimumScaleFactor = 0.5f;
-+	cell.detailTextLabel.minimumScaleFactor = 0.5f;
- 	return cell;
- }
- 
-1.8.3.4 (Apple Git-47)
-