Remove upstreamed patch

3 files changed, 6 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20491e1979ec..5641aa1149ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aegisub-ttools-meson-git
 	pkgdesc = A general-purpose subtitle editor with ASS/SSA support (TypesettingTools fork)
-	pkgver = 3.2.2.r666.4776ca9dd
+	pkgver = 3.2.2.r672.5bde34ff3
 	pkgrel = 1
 	url = http://www.aegisub.org
 	arch = x86_64
@@ -34,11 +34,9 @@ pkgbase = aegisub-ttools-meson-git
 	source = luajit::git+https://github.com/LuaJIT/LuaJIT.git#branch=v2.1
 	source = gtest-1.8.1.zip::https://github.com/google/googletest/archive/release-1.8.1.zip
 	source = gtest-1.8.1-1-wrap.zip::https://wrapdb.mesonbuild.com/v1/projects/gtest/1.8.1/1/get_zip
-	source = 01-include-memory.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7
 	sha256sums = f79f5fd46e09507b3f2e09a51ea6eb20020effe543335f5aee59f30cc8d15805
-	sha256sums = 0248415770590d70caedb04494c8eeec495ee740116defb2485798d706a4bfc7
 
 pkgname = aegisub-ttools-meson-git
diff --git a/01-include-memory.patch b/01-include-memory.patch
deleted file mode 100644
index 7672cfa50ec0..000000000000
--- a/01-include-memory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d6fad3e9f9e07ee94956589c89a1d0cf96658cd5 Mon Sep 17 00:00:00 2001
-From: arch1t3cht <arch1t3cht@gmail.com>
-Date: Fri, 1 Jul 2022 20:23:24 +0200
-Subject: [PATCH] Fix compile error on linux
-
----
- libaegisub/include/libaegisub/audio/provider.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libaegisub/include/libaegisub/audio/provider.h b/libaegisub/include/libaegisub/audio/provider.h
-index debb560ce..70460a723 100644
---- a/libaegisub/include/libaegisub/audio/provider.h
-+++ b/libaegisub/include/libaegisub/audio/provider.h
-@@ -20,6 +20,7 @@
- #include <libaegisub/fs_fwd.h>
- 
- #include <atomic>
-+#include <memory>
- #include <vector>
- 
- namespace agi {
diff --git a/PKGBUILD b/PKGBUILD
index 084fde83c053..53566315807d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=aegisub-ttools-meson-git
 _srcname=aegisub-ttools
-pkgver=3.2.2.r666.4776ca9dd
+pkgver=3.2.2.r672.5bde34ff3
 pkgrel=1
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support (TypesettingTools fork)'
 arch=('x86_64')
@@ -25,7 +25,6 @@ source=(
   "luajit::git+https://github.com/LuaJIT/LuaJIT.git#branch=v2.1"
   "gtest-1.8.1.zip::https://github.com/google/googletest/archive/release-1.8.1.zip"
   "gtest-1.8.1-1-wrap.zip::https://wrapdb.mesonbuild.com/v1/projects/gtest/1.8.1/1/get_zip"
-  "01-include-memory.patch"
 )
 noextract=(
   "gtest-1.8.1.zip"
@@ -36,7 +35,6 @@ sha256sums=(
   'SKIP'
   '927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7'
   'f79f5fd46e09507b3f2e09a51ea6eb20020effe543335f5aee59f30cc8d15805'
-  '0248415770590d70caedb04494c8eeec495ee740116defb2485798d706a4bfc7'
 )
 
 pkgver() {
@@ -49,10 +47,10 @@ pkgver() {
 prepare() {
   cd "$_srcname"
 
-    for patch in ../*.patch; do
-        echo "  applying patch: $patch"
-        patch -u -p1 < "$patch"
-    done
+  # for patch in ../*.patch; do
+  #   echo "  applying patch: $patch"
+  #   patch -u -p1 < "$patch"
+  # done
 
   # Initialize subproject wraps for luajit
   ln -s ../../luajit subprojects/luajit