Switch to the new menson build system

3 files changed, 85 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be7c1e256124..f54ddfd8d802 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,50 @@
 pkgbase = gnome-builder-git
-	pkgdesc = Builder, a new IDE for Gnome
-	pkgver = 2657.cac6cfe
-	pkgrel = 4
+	pkgdesc = An IDE for writing GNOME-based software
+	pkgver = 3.27.90+27+g2c097bc19
+	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Builder
 	install = gnome-builder.install
 	arch = i686
 	arch = x86_64
-	license = GPL
-	makedepends = gnome-common
-	makedepends = gobject-introspection
-	makedepends = llvm
+	license = GPL3
 	makedepends = intltool
+	makedepends = llvm
+	makedepends = gobject-introspection
+	makedepends = gtk-doc
+	makedepends = yelp-tools
+	makedepends = appstream-glib
+	makedepends = vala
+	makedepends = git
+	makedepends = mm-common
+	makedepends = meson
 	depends = gtksourceview3
-	depends = gtk3
-	depends = libpeas
-	depends = gsettings-desktop-schemas
-	depends = dconf
 	depends = devhelp
-	depends = glade
-	depends = webkit2gtk
-	depends = gtk-doc
-	depends = clang
-	depends = gjs
 	depends = libgit2-glib
-	depends = glib2
+	depends = gjs
+	depends = python-gobject
+	depends = clang
+	depends = desktop-file-utils
+	depends = ctags
+	depends = libpeas
+	depends = vte3
+	depends = vala
+	depends = python-jedi
+	depends = autoconf-archive
+	depends = sysprof
+	depends = flatpak
+	depends = gspell
+	depends = libdazzle
+	depends = template-glib
+	depends = jsonrpc-glib
+	depends = python-sphinx
+	optdepends = gnome-code-assistance: Legacy assistance services
+	optdepends = meson: Meson support
+	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 3e4e7a2c19b1..7265ab0f6916 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,47 @@
+# Maintainer: Ivan Semkin (ivan at semkin dot ru)
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Tim Jester-Pfadt <t.jp<at>gmx.de>
 
+_pkgname=gnome-builder
 pkgname=gnome-builder-git
-pkgver=2657.cac6cfe
-pkgrel=4
-pkgdesc="Builder, a new IDE for Gnome"
+pkgver=3.27.90+27+g2c097bc19
+pkgrel=1
+pkgdesc="An IDE for writing GNOME-based software"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Apps/Builder"
-license=(GPL)
+license=(GPL3)
 conflicts=(gnome-builder)
-depends=('gtksourceview3' 'gtk3' 'libpeas' 'gsettings-desktop-schemas' 'dconf' 'devhelp' 'glade' 'webkit2gtk' 'gtk-doc' 'clang' 'gjs' 
-'libgit2-glib' 'glib2')
-makedepends=('gnome-common' 'gobject-introspection' 'llvm' 'intltool')
+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
+         template-glib jsonrpc-glib 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')
-sha256sums=('SKIP')
+source=('git+git://git.gnome.org/gnome-builder'
+        enchant-2.diff)
+sha256sums=('SKIP'
+            'a9c69574433f83de76e488d5da6656e455dcbea80ff788141bae269c04ebc92b')
 
-build() {
-  cd "$srcdir"/gnome-builder
-  #autoreconf -fi
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-rdtscp --disable-schemas-compile
-  make
+pkgver() {
+  cd $_pkgname
+  git describe --tags | sed 's/^GNOME_BUILDER_//;s/_/./g;s/-/+/g'
 }
 
-package() {
-  cd "$srcdir"/gnome-builder
-  make DESTDIR="$pkgdir" install
+prepare() {
+  cd $_pkgname/src
+
+  # enchant 2.2
+  patch -Np1 -i ../../enchant-2.diff
 }
 
-pkgver() {
-  cd "$srcdir"/gnome-builder
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+build() {
+  arch-meson $_pkgname build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
 }
diff --git a/enchant-2.diff b/enchant-2.diff
new file mode 100644
index 000000000000..0695778631d8
--- /dev/null
+++ b/enchant-2.diff
@@ -0,0 +1,16 @@
+ 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,