Drop merged patches

5 files changed, 12 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 907c0efde010..664035833f67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = futurerestore-git
 	pkgdesc = iOS upgrade and downgrade tool utilizing SHSH blobs - git version
-	pkgver = r180.38b1680
-	pkgrel = 1
+	pkgver = r182.88861b6
+	pkgrel = 2
 	url = https://github.com/tihmstar/futurerestore
 	arch = x86_64
 	license = LGPL3
@@ -22,18 +22,14 @@ pkgbase = futurerestore-git
 	source = git+https://github.com/tihmstar/tsschecker.git
 	source = git+https://github.com/tihmstar/idevicerestore.git
 	source = git+https://github.com/tihmstar/jssy.git
-	source = futurerestore-0001-Exclude-subdirs-from-install.patch
-	source = futurerestore-0002-Fix-incorrect-language-standard.patch
-	source = futurerestore-0003-Don-t-overwrite-CFLAGS.patch
+	source = futurerestore-0001-Fix-incorrect-language-standard.patch
 	source = tsschecker-0001-Fix-incorrect-language-standard.patch
 	source = idevicerestore-0001-configure.ac-check-for-pthreads.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 173e2299818e9a29183dc805301960ccd07f7fde1abc5ffa6f4cf82d365f5ae9
-	sha256sums = 068a9581b71ba6625062d2eb13ad716dfe865bfa057692f4b62f7963f659e34c
-	sha256sums = 79de9311acdf8a382293b499a671bbd7a434266d33f78227bfab645afe2b4c03
+	sha256sums = 18ff40ea773b1af3cf37fed3964e2f8d0a8badfb908c3e9697e920be08901883
 	sha256sums = 3fcde7558ae9f5ebfa930a2b02074251a6817e2a984c8d0e18113baa0ea708a5
 	sha256sums = 0e40eb0567a96a619fce0f2daf8bb4779a9753554ed7356bd04cf0ea15d18296
 
diff --git a/PKGBUILD b/PKGBUILD
index a477666a4bb5..b044babf4fd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _name=futurerestore
 pkgname=$_name-git
-pkgver=r180.38b1680
-pkgrel=1
+pkgver=r182.88861b6
+pkgrel=2
 pkgdesc='iOS upgrade and downgrade tool utilizing SHSH blobs - git version'
 arch=('x86_64')
 url="https://github.com/tihmstar/$_name"
@@ -17,18 +17,14 @@ source=("git+$url.git"
         'git+https://github.com/tihmstar/tsschecker.git'
         'git+https://github.com/tihmstar/idevicerestore.git'
         'git+https://github.com/tihmstar/jssy.git'
-        "$_name-0001-Exclude-subdirs-from-install.patch"
-        "$_name-0002-Fix-incorrect-language-standard.patch"
-        "$_name-0003-Don-t-overwrite-CFLAGS.patch"
+        "$_name-0001-Fix-incorrect-language-standard.patch"
         'tsschecker-0001-Fix-incorrect-language-standard.patch'
         'idevicerestore-0001-configure.ac-check-for-pthreads.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '173e2299818e9a29183dc805301960ccd07f7fde1abc5ffa6f4cf82d365f5ae9'
-            '068a9581b71ba6625062d2eb13ad716dfe865bfa057692f4b62f7963f659e34c'
-            '79de9311acdf8a382293b499a671bbd7a434266d33f78227bfab645afe2b4c03'
+            '18ff40ea773b1af3cf37fed3964e2f8d0a8badfb908c3e9697e920be08901883'
             '3fcde7558ae9f5ebfa930a2b02074251a6817e2a984c8d0e18113baa0ea708a5'
             '0e40eb0567a96a619fce0f2daf8bb4779a9753554ed7356bd04cf0ea15d18296')
 
diff --git a/futurerestore-0001-Exclude-subdirs-from-install.patch b/futurerestore-0001-Exclude-subdirs-from-install.patch
deleted file mode 100644
index a0c4bafbca83..000000000000
--- a/futurerestore-0001-Exclude-subdirs-from-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From deb8cd0225421c67a6c10dc76b25c407a46362cd Mon Sep 17 00:00:00 2001
-From: Luke Street <luke.street@encounterpc.com>
-Date: Sat, 10 Mar 2018 10:23:40 -0500
-Subject: [PATCH 1/3] Exclude subdirs from install
-
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7aae844..be54f0f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = external/idevicerestore external/tsschecker futurerestore
-+install installdirs: SUBDIRS = futurerestore
--- 
-2.25.0
-
diff --git a/futurerestore-0002-Fix-incorrect-language-standard.patch b/futurerestore-0001-Fix-incorrect-language-standard.patch
index c08ca696f66a..df989ad9f06f 100644
--- a/futurerestore-0002-Fix-incorrect-language-standard.patch
+++ b/futurerestore-0001-Fix-incorrect-language-standard.patch
@@ -1,20 +1,20 @@
-From 52aae49ebe45629040114606cd97e2bf3bd05f79 Mon Sep 17 00:00:00 2001
+From b014224a07540ce0d75b745fed486c33c8d4611f Mon Sep 17 00:00:00 2001
 From: 0x9fff00 <0x9fff00+git@protonmail.ch>
 Date: Fri, 8 Nov 2019 23:30:28 +0100
-Subject: [PATCH 2/3] Fix incorrect language standard
+Subject: [PATCH] Fix incorrect language standard
 
 ---
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0af46b1..88f0ff6 100644
+index 38965fb..f0b2683 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -28,8 +28,8 @@ esac
  
  # Checks the flags.
- CFLAGS="-DIDEVICERESTORE_NOMAIN=1 -DTSSCHECKER_NOMAIN=1"
+ CFLAGS+=" -DIDEVICERESTORE_NOMAIN=1 -DTSSCHECKER_NOMAIN=1"
 -CXXFLAGS+=" -std=c++11"
 -CFLAGS+=" -std=c11"
 +CXXFLAGS+=" -std=gnu++11"
diff --git a/futurerestore-0003-Don-t-overwrite-CFLAGS.patch b/futurerestore-0003-Don-t-overwrite-CFLAGS.patch
deleted file mode 100644
index 631ef1357d0f..000000000000
--- a/futurerestore-0003-Don-t-overwrite-CFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f4e1bd75594efacecf916fdc3c3766a4db55937c Mon Sep 17 00:00:00 2001
-From: 0x9fff00 <0x9fff00+git@protonmail.ch>
-Date: Sat, 8 Feb 2020 19:09:11 +0100
-Subject: [PATCH 3/3] Don't overwrite CFLAGS
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 88f0ff6..f0b2683 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ case $host_os in
- esac
- 
- # Checks the flags.
--CFLAGS="-DIDEVICERESTORE_NOMAIN=1 -DTSSCHECKER_NOMAIN=1"
-+CFLAGS+=" -DIDEVICERESTORE_NOMAIN=1 -DTSSCHECKER_NOMAIN=1"
- CXXFLAGS+=" -std=gnu++11"
- CFLAGS+=" -std=gnu11"
- 
--- 
-2.25.0
-