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

[Evangelos Foutras]

    Date: Friday, November 20, 2020 @ 12:24:04
  Author: foutrelis
Revision: 401539

Fix build with Vala >= 0.49.1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-20 11:45:39 UTC (rev 401538)
+++ PKGBUILD	2020-11-20 12:24:04 UTC (rev 401539)
@@ -12,8 +12,10 @@
          libdazzle)
 makedepends=(gobject-introspection git meson vala)
 _commit=b4c8155f641ed2d1afa8a090a04b44853286abe1  # gnome-3-32
-source=("git+https://gitlab.gnome.org/GNOME/gitg.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/gitg.git#commit=$_commit"
+        allow-nullable-head-parameter-in-stash_if_needed.patch)
+sha256sums=('SKIP'
+            'e898a9d6d1cfed98edafd8f39b592ae7e47037ff51772f88bc2e085fc7bf5dec')
 
 pkgver() {
   cd $pkgname
@@ -22,6 +24,8 @@
 
 prepare() {
   cd $pkgname
+  # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/159
+  patch -Np1 -i ../allow-nullable-head-parameter-in-stash_if_needed.patch
 }
 
 build() {

Added: allow-nullable-head-parameter-in-stash_if_needed.patch
===================================================================
--- allow-nullable-head-parameter-in-stash_if_needed.patch	                        (rev 0)
+++ allow-nullable-head-parameter-in-stash_if_needed.patch	2020-11-20 12:24:04 UTC (rev 401539)
@@ -0,0 +1,31 @@
+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()))