Remove the enchant patch that's no longer needed

3 files changed, 16 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d89dc63ce88..335592d7d174 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnome-builder-git
 	pkgdesc = An IDE for writing GNOME-based software
-	pkgver = 3.27.90+27+g2c097bc19
+	pkgver = 3.29.2+40+gd16771663
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Builder
 	install = gnome-builder.install
@@ -9,7 +9,7 @@ pkgbase = gnome-builder-git
 	license = GPL3
 	makedepends = intltool
 	makedepends = llvm
-	makedepends = gobject-introspection-git
+	makedepends = gobject-introspection
 	makedepends = gtk-doc
 	makedepends = yelp-tools
 	makedepends = appstream-glib
@@ -34,7 +34,7 @@ pkgbase = gnome-builder-git
 	depends = flatpak
 	depends = gspell
 	depends = libdazzle-git
-	depends = template-glib-git
+	depends = template-glib
 	depends = jsonrpc-glib-git
 	depends = python-sphinx
 	optdepends = gnome-code-assistance: Legacy assistance services
@@ -42,9 +42,7 @@ pkgbase = gnome-builder-git
 	provides = gnome-builder
 	conflicts = gnome-builder
 	source = git+git://git.gnome.org/gnome-builder
-	source = enchant-2.diff
 	sha256sums = SKIP
-	sha256sums = a9c69574433f83de76e488d5da6656e455dcbea80ff788141bae269c04ebc92b
 
 pkgname = gnome-builder-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c0a65a177229..ff0b7768324a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,44 +4,37 @@
 
 _pkgname=gnome-builder
 pkgname=gnome-builder-git
-pkgver=3.27.90+27+g2c097bc19
+pkgver=3.29.2+40+gd16771663
 pkgrel=1
-pkgdesc="An IDE for writing GNOME-based software"
-arch=('i686' 'x86_64')
-url="https://wiki.gnome.org/Apps/Builder"
+pkgdesc='An IDE for writing GNOME-based software'
+arch=(i686 x86_64)
+url='https://wiki.gnome.org/Apps/Builder'
 license=(GPL3)
 conflicts=(gnome-builder)
 provides=(gnome-builder)
 depends=(gtksourceview3 devhelp libgit2-glib gjs python-gobject clang desktop-file-utils
          ctags libpeas vte3 vala python-jedi autoconf-archive sysprof flatpak gspell libdazzle-git
-         template-glib-git jsonrpc-glib-git python-sphinx)
-makedepends=(intltool llvm gobject-introspection-git gtk-doc yelp-tools appstream-glib vala git
+         template-glib jsonrpc-glib-git python-sphinx)
+makedepends=(intltool llvm gobject-introspection gtk-doc yelp-tools appstream-glib vala git
              mm-common meson)
 optdepends=('gnome-code-assistance: Legacy assistance services'
             'meson: Meson support')
 install=gnome-builder.install
-source=('git+git://git.gnome.org/gnome-builder'
-        enchant-2.diff)
-sha256sums=('SKIP'
-            'a9c69574433f83de76e488d5da6656e455dcbea80ff788141bae269c04ebc92b')
+source=('git+git://git.gnome.org/gnome-builder')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
+  cd ${_pkgname}
   git describe --tags | sed 's/^GNOME_BUILDER_//;s/_/./g;s/-/+/g'
 }
 
-prepare() {
-  cd $_pkgname/src
-
-  # enchant 2.2
-  patch -Np1 -i ../../enchant-2.diff
-}
-
 build() {
-  arch-meson $_pkgname build
+  arch-meson ${_pkgname} build
   ninja -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
+# vim:set ts=2 sw=2 et:
+
diff --git a/enchant-2.diff b/enchant-2.diff
deleted file mode 100644
index 0695778631d8..000000000000
--- a/enchant-2.diff
+++ /dev/null
@@ -1,16 +0,0 @@
- plugins/spellcheck/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git c/plugins/spellcheck/meson.build i/plugins/spellcheck/meson.build
-index a8dc0036a..a9835672b 100644
---- c/plugins/spellcheck/meson.build
-+++ i/plugins/spellcheck/meson.build
-@@ -30,7 +30,7 @@ spellcheck_sources = [
- 
- spellcheck_deps = plugin_deps + [
-   dependency('gspell-1', version: '>= 1.2.0'),
--  dependency('enchant'),
-+  dependency('enchant-2'),
- ]
- 
- shared_module('spellcheck-plugin', spellcheck_sources,