From 3da54d9c1770643d9cb5937e4cb8a4f8f6b63c77 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 5 Dec 2016 15:42:19 +0100
Subject: [PATCH] Update to 0.34.4

---
 .gitignore                                    |  1 +
 ...port-for-fixed-size-array-as-return-.patch | 33 -------------------
 sources                                       |  2 +-
 vala.spec                                     | 10 +++---
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 0001-girparser-No-support-for-fixed-size-array-as-return-.patch

diff --git a/.gitignore b/.gitignore
index 4980de8..ee3c7aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /vala-0.34.1.tar.xz
 /vala-0.34.2.tar.xz
 /vala-0.34.3.tar.xz
+/vala-0.34.4.tar.xz
diff --git a/0001-girparser-No-support-for-fixed-size-array-as-return-.patch b/0001-girparser-No-support-for-fixed-size-array-as-return-.patch
deleted file mode 100644
index f43e839..0000000
--- a/0001-girparser-No-support-for-fixed-size-array-as-return-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7e76f75e42e7ac45c896e81e97955c8b2089d7e9 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Thu, 24 Nov 2016 09:23:40 +0100
-Subject: [PATCH] girparser: No support for fixed-size array as return-value
-
-Due to the special syntax for those arrays it lead to omitting the
-array-qualifier and therefore generating broken bindings.
----
- vala/valagirparser.vala | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
-index d05d08a..b0ae2b0 100644
---- a/vala/valagirparser.vala
-+++ b/vala/valagirparser.vala
-@@ -2387,6 +2387,14 @@ public class Vala.GirParser : CodeVisitor {
- 			type.nullable = true;
- 		}
- 		type = element_get_type (type, true, ref no_array_length, ref array_null_terminated);
-+
-+		// FIXME No support for fixed-size array as return-value
-+		var array_type = type as ArrayType;
-+		if (array_type != null && array_type.fixed_length) {
-+			array_type.fixed_length = false;
-+			array_type.length = null;
-+		}
-+
- 		end_element ("return-value");
- 		return type;
- 	}
--- 
-2.9.3
-
diff --git a/sources b/sources
index c0b9965..6f1fe3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71181dd25d06b0bedd378dc8fa7d6310  vala-0.34.3.tar.xz
+a856989d749fc5e472a3592b96f9ca48  vala-0.34.4.tar.xz
diff --git a/vala.spec b/vala.spec
index 75c0db9..4f30c4a 100644
--- a/vala.spec
+++ b/vala.spec
@@ -2,8 +2,8 @@
 %global priority 90
 
 Name:           vala
-Version:        0.34.3
-Release:        3%{?dist}
+Version:        0.34.4
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
 # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
@@ -12,8 +12,6 @@ URL:            https://wiki.gnome.org/Projects/Vala
 Source0:        https://download.gnome.org/sources/vala/0.34/vala-%{version}.tar.xz
 # https://bugzilla.gnome.org/show_bug.cgi?id=775446
 Patch0:         0001-codegen-Add-function-prototypes-for-all-register-typ.patch
-# Backported from upstream
-Patch1:         0001-girparser-No-support-for-fixed-size-array-as-return-.patch
 
 BuildRequires:  flex
 BuildRequires:  bison
@@ -91,7 +89,6 @@ This package contains documentation in a devhelp HTML book.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -187,6 +184,9 @@ done
 
 
 %changelog
+* Mon Dec 05 2016 Kalev Lember <klember@redhat.com> - 0.34.4-1
+- Update to 0.34.4
+
 * Fri Dec 02 2016 Kalev Lember <klember@redhat.com> - 0.34.3-3
 - Backport a patch to support fixed-size array as return-value (#1398738)