[gnome-ostree] manifest: Update vala patch, untag gobject-introspection



commit 41f6f036622936d686921db3c140734fa965c208
Author: Colin Walters <walters verbum org>
Date:   Sat Feb 2 08:23:26 2013 -0500

    manifest: Update vala patch, untag gobject-introspection
    
    This should make e-d-s build again.

 manifest.json                          |    1 -
 patches/vala-vapigen-ignore-node.patch |   29 +++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 44ae606..877213e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -93,7 +93,6 @@
 		             "hwdata-no-spec-file.patch"]},
 
                 {"src": "gnome:gobject-introspection",
-		 "tag": "7cfc4ce3321dd98b33d89d4065eeb66280e0b24a",
 		 "config-opts": ["--disable-tests"]},
 
    		{"src": "git:git://anongit.freedesktop.org/systemd/systemd",
diff --git a/patches/vala-vapigen-ignore-node.patch b/patches/vala-vapigen-ignore-node.patch
index 39d6ab5..7e992f1 100644
--- a/patches/vala-vapigen-ignore-node.patch
+++ b/patches/vala-vapigen-ignore-node.patch
@@ -1,29 +1,30 @@
-From 15c59a42ad492c925a52d7d850c441b7c09fac5f Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre mecheye net>
+From 9146e8c8ab963a50dec3142678be41d2fdf39d3f Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre mecheye net>
 Date: Sat, 2 Feb 2013 04:56:39 -0500
-Subject: [PATCH] valagirparser: Make vala's GIR parser understand the new
- instance-parameter tag
+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.
 ---
- vala/valagirparser.vala | 5 +++++
- 1 file changed, 5 insertions(+)
+ vala/valagirparser.vala |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
-index 0a90886..354d10b 100644
+index 0a90886..8256ef2 100644
 --- a/vala/valagirparser.vala
 +++ b/vala/valagirparser.vala
-@@ -2901,6 +2901,11 @@ public class Vala.GirParser : CodeVisitor {
- 					continue;
- 				}
+@@ -2896,6 +2896,11 @@ public class Vala.GirParser : CodeVisitor {
+ 			next ();
  
+ 			while (current_token == MarkupTokenType.START_ELEMENT) {
 +				if (reader.name == "instance-parameter") {
 +					skip_element ();
 +					continue;
 +				}
 +
- 				int array_length_idx, closure_idx, destroy_idx;
- 				string scope;
- 				string default_param_name = null;
+ 				if (!push_metadata ()) {
+ 					skip_element ();
+ 					continue;
 -- 
-1.8.1
+1.7.1
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]