Update to 0.34.4

This commit is contained in:
Kalev Lember 2016-12-05 15:42:19 +01:00
parent c5e83e8971
commit 3da54d9c17
4 changed files with 7 additions and 39 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
71181dd25d06b0bedd378dc8fa7d6310 vala-0.34.3.tar.xz
a856989d749fc5e472a3592b96f9ca48 vala-0.34.4.tar.xz

View File

@ -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)