[arch-commits] Commit in gnome-builder/repos/testing-x86_64 (3 files)

[Jan Steffens]

    Date: Tuesday, March 3, 2020 @ 19:37:12
  Author: heftig
Revision: 376527

archrelease: copy trunk to testing-x86_64

Added:
  gnome-builder/repos/testing-x86_64/PKGBUILD
    (from rev 376526, gnome-builder/trunk/PKGBUILD)
Deleted:
  gnome-builder/repos/testing-x86_64/PKGBUILD
  gnome-builder/repos/testing-x86_64/libgit2.diff

--------------+
 PKGBUILD     |  111 ++++++++++++++++++++++++++++-----------------------------
 libgit2.diff |   16 --------
 2 files changed, 56 insertions(+), 71 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 19:26:44 UTC (rev 376526)
+++ PKGBUILD	2020-03-03 19:37:12 UTC (rev 376527)
@@ -1,55 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-builder
-pkgver=3.34.1+11+gbf485934b
-pkgrel=1
-pkgdesc="An IDE for writing GNOME-based software"
-url="https://wiki.gnome.org/Apps/Builder"
-arch=(x86_64)
-license=(GPL3)
-depends=(gtksourceview4 devhelp libgit2-glib gjs python-gobject clang desktop-file-utils ctags
-         libpeas vte3 vala python-jedi autoconf-archive sysprof flatpak-builder gspell libdazzle
-         template-glib jsonrpc-glib python-sphinx webkit2gtk glade python-lxml meson)
-makedepends=(llvm gobject-introspection gtk-doc yelp-tools appstream-glib git mm-common
-             python-sphinx_rtd_theme)
-checkdepends=(xorg-server-xvfb)
-optdepends=('gnome-code-assistance: Legacy assistance services')
-groups=(gnome-extra)
-_commit=bf485934b3762c6915419458623b850b4a63c2a8  # gnome-builder-3-34
-source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit"
-        libgit2.diff)
-sha256sums=('SKIP'
-            '968d30b68c67e7b89d39e5db870b62adbf73cfd98a8e2f44b4cd515035f73f50')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^GNOME_BUILDER_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Fix build with meson 0.52
-  git cherry-pick -n c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f
-  git cherry-pick -n da26dfbf78468f5ed724e022b300a07862a95833
-
-  # Fix build with libgit2 0.99
-  git apply -3 ../libgit2.diff
-}
-
-build() {
-  arch-meson $pkgname build \
-    -D docs=true \
-    -D help=true
-  ninja -C build
-}
-
-check() {
-  xvfb-run meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set sw=2 et:

Copied: gnome-builder/repos/testing-x86_64/PKGBUILD (from rev 376526, gnome-builder/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-03 19:37:12 UTC (rev 376527)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-builder
+pkgver=3.34.1+11+gbf485934b
+pkgrel=2
+pkgdesc="An IDE for writing GNOME-based software"
+url="https://wiki.gnome.org/Apps/Builder"
+arch=(x86_64)
+license=(GPL3)
+depends=(gtksourceview4 devhelp libgit2-glib gjs python-gobject clang desktop-file-utils ctags
+         libpeas vte3 vala python-jedi autoconf-archive sysprof flatpak-builder gspell libdazzle
+         template-glib jsonrpc-glib python-sphinx webkit2gtk glade python-lxml meson)
+makedepends=(llvm gobject-introspection gtk-doc yelp-tools appstream-glib git mm-common
+             python-sphinx_rtd_theme)
+checkdepends=(xorg-server-xvfb)
+optdepends=('gnome-code-assistance: Legacy assistance services')
+groups=(gnome-extra)
+_commit=bf485934b3762c6915419458623b850b4a63c2a8  # gnome-builder-3-34
+source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNOME_BUILDER_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # meson 0.52
+  git cherry-pick -n c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f
+  git cherry-pick -n da26dfbf78468f5ed724e022b300a07862a95833
+
+  # libgit2 0.99
+  git cherry-pick -n 582bf0281358437cc35d96d363f0af81a1b21068
+
+  # vala 0.48
+  git cherry-pick -n fc4607dec2f3dca5dbfee7a56662856dc5a60254
+}
+
+build() {
+  arch-meson $pkgname build \
+    -D docs=true \
+    -D help=true
+  ninja -C build
+}
+
+check() {
+  xvfb-run meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}
+
+# vim:set sw=2 et:

Deleted: libgit2.diff
===================================================================
--- libgit2.diff	2020-03-03 19:26:44 UTC (rev 376526)
+++ libgit2.diff	2020-03-03 19:37:12 UTC (rev 376527)
@@ -1,16 +0,0 @@
- src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git c/src/plugins/git/daemon/ipc-git-repository-impl.c i/src/plugins/git/daemon/ipc-git-repository-impl.c
-index 7f010427a..c5028658d 100644
---- c/src/plugins/git/daemon/ipc-git-repository-impl.c
-+++ i/src/plugins/git/daemon/ipc-git-repository-impl.c
-@@ -33,7 +33,7 @@
- #include "ipc-git-types.h"
- #include "ipc-git-util.h"
- 
--#if LIBGIT2_SOVERSION >= 28
-+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
- G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose)
- #else
- G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free)