diff --git a/0001-valagirparser-Ignore-the-new-instance-parameter-tag.patch b/0001-valagirparser-Ignore-the-new-instance-parameter-tag.patch new file mode 100644 index 0000000..e16028f --- /dev/null +++ b/0001-valagirparser-Ignore-the-new-instance-parameter-tag.patch @@ -0,0 +1,32 @@ +From c755bb4bd3b078363193ea41495e4c9f2782a9d8 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" +Date: Sat, 2 Feb 2013 04:56:39 -0500 +Subject: [PATCH] valagirparser: Ignore the new instance-parameter tag + +g-ir-scanner will now start emitting the instance parameter; since +vala doesn't need this, just skip it. + +https://bugzilla.gnome.org/show_bug.cgi?id=693054 +--- + vala/valagirparser.vala | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala +index 0a90886..8256ef2 100644 +--- a/vala/valagirparser.vala ++++ b/vala/valagirparser.vala +@@ -2896,6 +2896,11 @@ public class Vala.GirParser : CodeVisitor { + next (); + + while (current_token == MarkupTokenType.START_ELEMENT) { ++ if (reader.name == "instance-parameter") { ++ skip_element (); ++ continue; ++ } ++ + if (!push_metadata ()) { + skip_element (); + continue; +-- +1.8.1.4 + diff --git a/vala.spec b/vala.spec index 1fc84a4..021a1fb 100644 --- a/vala.spec +++ b/vala.spec @@ -3,7 +3,7 @@ Name: vala Version: 0.18.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD @@ -18,6 +18,9 @@ Source1: vala-mode.el Source2: vala-init.el Source3: emacs-vala-COPYING +# Backported patch to ignore the "instance-parameter" tag emitted by g-ir-scanner +Patch0: 0001-valagirparser-Ignore-the-new-instance-parameter-tag.patch + BuildRequires: flex BuildRequires: bison BuildRequires: glib2-devel @@ -273,6 +276,9 @@ done %changelog +* Wed Feb 20 2013 Kalev Lember - 0.18.1-3 +- Ignore the "instance-parameter" tag emitted by new g-ir-scanner + * Fri Feb 15 2013 Fedora Release Engineering - 0.18.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild