[arch-commits] Commit in gitg/trunk (2 files)

[Jan Steffens]

    Date: Monday, November 22, 2021 @ 19:44:08
  Author: heftig
Revision: 428966

3.32.1+r23+g33bb5d2d-1

Modified:
  gitg/trunk/PKGBUILD
Deleted:
  gitg/trunk/allow-nullable-head-parameter-in-stash_if_needed.patch

--------------------------------------------------------+
 PKGBUILD                                               |   35 +++++++--------
 allow-nullable-head-parameter-in-stash_if_needed.patch |   31 -------------
 2 files changed, 17 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-22 19:28:48 UTC (rev 428965)
+++ PKGBUILD	2021-11-22 19:44:08 UTC (rev 428966)
@@ -1,36 +1,35 @@
 # Contributor: Eric Bélanger <eric at archlinux.org>
 
 pkgname=gitg
-pkgver=3.32.1+17+gb4c8155f
-pkgrel=2
-epoch=1
+pkgver=3.32.1+r23+g33bb5d2d
+pkgrel=1
+epoch=2
 pkgdesc="GNOME GUI client to view git repositories"
 url="https://wiki.gnome.org/Apps/Gitg"
 arch=(x86_64)
 license=(GPL)
-depends=(gtksourceview3 git libgit2-glib libgee webkit2gtk libpeas gtkspell3 python-gobject
-         libdazzle)
+depends=(gtksourceview3 git libgit2-glib libgee webkit2gtk libpeas gtkspell3
+         python-gobject libdazzle)
 makedepends=(gobject-introspection git meson vala)
-_commit=b4c8155f641ed2d1afa8a090a04b44853286abe1  # gnome-3-32
-source=("git+https://gitlab.gnome.org/GNOME/gitg.git#commit=$_commit"
-        allow-nullable-head-parameter-in-stash_if_needed.patch)
-sha256sums=('SKIP'
-            'e898a9d6d1cfed98edafd8f39b592ae7e47037ff51772f88bc2e085fc7bf5dec')
+_commit=33bb5d2d896fcf2fc9a2ed50b236b727c5364895  # gnome-3-32
+source=("git+https://gitlab.gnome.org/GNOME/gitg.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
+  cd gitg
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
-  # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/159
-  patch -Np1 -i ../allow-nullable-head-parameter-in-stash_if_needed.patch
+  cd gitg
+
+  # fix tests
+  git cherry-pick -n b9f102c760adaee8185567007bcbe3b6604754f2
 }
 
 build() {
-  arch-meson $pkgname build
-  ninja -C build
+  arch-meson gitg build
+  meson compile -C build
 }
 
 check() {
@@ -38,7 +37,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
   python -m compileall -d /usr/lib "$pkgdir/usr/lib"
   python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 }

Deleted: allow-nullable-head-parameter-in-stash_if_needed.patch
===================================================================
--- allow-nullable-head-parameter-in-stash_if_needed.patch	2021-11-22 19:28:48 UTC (rev 428965)
+++ allow-nullable-head-parameter-in-stash_if_needed.patch	2021-11-22 19:44:08 UTC (rev 428966)
@@ -1,31 +0,0 @@
-From eddcb2a5cd9579e3b70b6aad56f1d5e89612f83a Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Fri, 20 Nov 2020 14:11:04 +0200
-Subject: [PATCH] Allow nullable head parameter in stash_if_needed()
-
-Newer versions of Vala perform parameter checks in async methods, so
-Gitg.ActionSupport.stash_if_needed's head param should be Gitg.Ref?.
-
-Related Vala issue: https://gitlab.gnome.org/GNOME/vala/-/issues/299
-
-Fixes the following assertion failure:
-
-  (tests/gitg/tests-gitg:2977): gitg-CRITICAL **: 07:44:32.083:
-    gitg_action_support_stash_if_needed: assertion 'head != NULL' failed
----
- gitg/gitg-action-support.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gitg/gitg-action-support.vala b/gitg/gitg-action-support.vala
-index 6eb7ad8d..d864fffc 100644
---- a/gitg/gitg-action-support.vala
-+++ b/gitg/gitg-action-support.vala
-@@ -122,7 +122,7 @@ public class ActionSupport : Object
- 		return head != null;
- 	}
- 
--	public async bool stash_if_needed(SimpleNotification notification, Gitg.Ref head)
-+	public async bool stash_if_needed(SimpleNotification notification, Gitg.Ref? head)
- 	{
- 		// Offer to stash if there are any local changes
- 		if ((yield working_directory_dirty()))