Remove patch - added upstream

3 files changed, 2 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40fdfdbc1747..9b6a82e675e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = refind-efi-git
 	pkgdesc = Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs - GIT Version
-	pkgver = 20121216
+	pkgver = 20121221
 	pkgrel = 1
 	url = http://www.rodsbooks.com/refind/index.html
 	arch = any
@@ -22,10 +22,8 @@ pkgbase = refind-efi-git
 	options = docs
 	options = !makeflags
 	source = UDK-MdePkg-Revert-PathNodeCount.patch
-	source = refind_include_more_shell_paths.patch
 	source = refind_linux.conf
 	sha1sums = 4d1992699f9b48dd2b7e6bd6c0b25fc065f75894
-	sha1sums = afa9ff2f982811655dcce4783e934b9abab1d4a3
 	sha1sums = 3d53eb615c3363d45feb95b9bfbf1d5491bf1c24
 
 pkgname = refind-efi-git
diff --git a/PKGBUILD b/PKGBUILD
index 243d957c3399..fdb8c8eefd29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ _COMPILER="GCC46"
 _pkgname="refind-efi"
 pkgname="${_pkgname}-git"
 
-pkgver=20121216
+pkgver=20121221
 pkgrel=1
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs - GIT Version"
 url="http://www.rodsbooks.com/refind/index.html"
@@ -29,11 +29,9 @@ conflicts=('refind-efi' 'refind-efi-tianocore' 'refind-efi-tianocore-git')
 provides=('refind-efi' 'refind-efi-tianocore' 'refind-efi-tianocore-git')
 
 source=('UDK-MdePkg-Revert-PathNodeCount.patch'
-        'refind_include_more_shell_paths.patch'
         'refind_linux.conf')
 
 sha1sums=('4d1992699f9b48dd2b7e6bd6c0b25fc065f75894'
-          'afa9ff2f982811655dcce4783e934b9abab1d4a3'
           '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24')
 
 _gitroot="git://git.code.sf.net/p/refind/code"
@@ -169,9 +167,6 @@ _refind_changes() {
 	
 	cd "${srcdir}/${_gitname}_build/"
 	
-	patch -Np1 -i "${srcdir}/refind_include_more_shell_paths.patch"
-	echo
-	
 }
 
 _build_refind-efi-common() {
diff --git a/refind_include_more_shell_paths.patch b/refind_include_more_shell_paths.patch
deleted file mode 100644
index 2ab5e59c0c2e..000000000000
--- a/refind_include_more_shell_paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/refind/main.c b/refind/main.c
-index ebb9fdd..240371d 100644
---- a/refind/main.c
-+++ b/refind/main.c
-@@ -63,13 +63,13 @@
- 
- #define MACOSX_LOADER_PATH      L"\\System\\Library\\CoreServices\\boot.efi"
- #if defined (EFIX64)
--#define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\shellx64.efi"
-+#define SHELL_NAMES             L"\\EFI\\tools\\shellx64.efi,\\EFI\\tools\\shell.efi,\\shellx64.efi"
- #define DRIVER_DIRS             L"drivers,drivers_x64"
- #elif defined (EFI32)
--#define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\shellia32.efi"
-+#define SHELL_NAMES             L"\\EFI\\tools\\shellia32.efi,\\EFI\\tools\\shell.efi,\\shellia32.efi"
- #define DRIVER_DIRS             L"drivers,drivers_ia32"
- #else
--#define SHELL_NAMES             L"\\EFI\\tools\\shell.efi"
-+#define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\shell.efi"
- #define DRIVER_DIRS             L"drivers"
- #endif
-