Remove patch as it was merged upstream

2 files changed, 2 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 102e7e6ed366..9e33c669a394 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = meld-git
 	pkgdesc = Visual diff and merge tool
-	pkgver = 3.21.0.216.g6e00779e
+	pkgver = 3.21.0.218.g631ef272
 	pkgrel = 1
 	url = http://meldmerge.org/
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index ca3d4e9f9214..63f8a3ddfe51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=meld
 pkgname=$_pkgname-git
-pkgver=3.21.0.216.g6e00779e
+pkgver=3.21.0.218.g631ef272
 pkgrel=1
 pkgdesc='Visual diff and merge tool'
 url='http://meldmerge.org/'
@@ -24,7 +24,6 @@ provides=('meld')
 conflicts=('meld' 'meld-dev')
 options=('!emptydirs')
 source=("git+https://gitlab.gnome.org/GNOME/meld.git")
-_merge_requests_to_use=('76')
 sha256sums=('SKIP')
 
 pkgver() {
@@ -32,23 +31,11 @@ pkgver() {
     git describe --always | sed 's|-|.|g'
 }
 
-prepare() {
-    cd $_pkgname
-
-    # Apply merge request 76 to fix launching Meld.
-    # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/76
-    echo "Downloading and applying merge request 76..."
-    curl -O "https://gitlab.gnome.org/GNOME/meld/-/merge_requests/76.diff"
-    git apply 76.diff
-}
-
 build() {
-    cd $srcdir
     arch-meson build $_pkgname -D byte-compile=false
     meson compile -C build
 }
 
 package() {
-    cd $srcdir
     meson install -C build --destdir "$pkgdir"
 }