sync with extra

2 files changed, 30 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 335592d7d174..3ac19c6bcf81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
+# Generated by makepkg 5.1.3
+# Tue Mar 12 06:50:58 UTC 2019
 pkgbase = gnome-builder-git
 	pkgdesc = An IDE for writing GNOME-based software
-	pkgver = 3.29.2+40+gd16771663
+	pkgver = 3.31.92+42+g78dfa2435
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Builder
-	install = gnome-builder.install
 	arch = i686
 	arch = x86_64
+	groups = gnome-extra
 	license = GPL3
 	makedepends = intltool
 	makedepends = llvm
@@ -17,7 +19,7 @@ pkgbase = gnome-builder-git
 	makedepends = git
 	makedepends = mm-common
 	makedepends = meson
-	depends = gtksourceview3
+	depends = gtksourceview4
 	depends = devhelp
 	depends = libgit2-glib
 	depends = gjs
@@ -35,13 +37,16 @@ pkgbase = gnome-builder-git
 	depends = gspell
 	depends = libdazzle-git
 	depends = template-glib
-	depends = jsonrpc-glib-git
+	depends = jsonrpc-glib
 	depends = python-sphinx
+	depends = webkit2gtk
+	depends = glade
+	depends = sysprof2-git
 	optdepends = gnome-code-assistance: Legacy assistance services
-	optdepends = meson: Meson support
+	optdepends = python-lxml: documentation support for Python auto-completion
 	provides = gnome-builder
 	conflicts = gnome-builder
-	source = git+git://git.gnome.org/gnome-builder
+	source = git+https://gitlab.gnome.org/GNOME/gnome-builder.git
 	sha256sums = SKIP
 
 pkgname = gnome-builder-git
diff --git a/PKGBUILD b/PKGBUILD
index ff0b7768324a..6cb8acc7dbb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=gnome-builder
 pkgname=gnome-builder-git
-pkgver=3.29.2+40+gd16771663
+pkgver=3.31.92+42+g78dfa2435
 pkgrel=1
 pkgdesc='An IDE for writing GNOME-based software'
 arch=(i686 x86_64)
@@ -12,15 +12,15 @@ 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
+depends=(gtksourceview4 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 jsonrpc-glib-git python-sphinx)
+         template-glib jsonrpc-glib python-sphinx webkit2gtk glade sysprof2-git)
 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')
+            'python-lxml: documentation support for Python auto-completion')
+groups=(gnome-extra)
+source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -29,12 +29,23 @@ pkgver() {
 }
 
 build() {
-  arch-meson ${_pkgname} build
+  arch-meson $_pkgname build \
+    --buildtype debugoptimized \
+    -D with_docs=true \
+    -D with_help=true \
+    -D with_editorconfig=true \
+    -D with_webkit=true \
+    -D with_vapi=true
   ninja -C build
 }
 
+check() {
+  # some tests need an installed gnome-builder
+  xvfb-run meson test -C build || :
+}
+
 package() {
-  DESTDIR="${pkgdir}" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }
 # vim:set ts=2 sw=2 et: