From 939111a34857c9f6eded2e286130ff334fdcdbd3 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Thu, 30 Nov 2017 21:59:07 -0300
Subject: [PATCH] Do not check padding ABI offset correctness

As it will break the test build as soon as the padding
starts actually being used.
---
 Source/Libs/GtkSharp/GtkSharp.metadata  | 4 ++++
 Source/Libs/Shared/Gapi.xsd             | 2 ++
 Source/Tools/GapiCodegen/ClassBase.cs   | 3 +++
 Source/Tools/GapiCodegen/StructField.cs | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/Libs/GtkSharp/GtkSharp.metadata b/Source/Libs/GtkSharp/GtkSharp.metadata
index 1334e897b..505b50580 100644
--- a/Source/Libs/GtkSharp/GtkSharp.metadata
+++ b/Source/Libs/GtkSharp/GtkSharp.metadata
@@ -1005,4 +1005,8 @@
   <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintVline']">/api/namespace/object[@cname='GtkStyle']</move-node>
   <remove-node path="/api/namespace/struct[@cname='IconSize']" />
   <remove-node path="/api/namespace/struct[@cname='Range']" />
+
+	<!-- Mark reserved fields as padding -->
+	<attr path="//*[contains(@cname, 'gtk_reserved')]" name="padding">true</attr>
+	<attr path="//*[contains(@vm, 'gtk_reserved')]" name="padding">true</attr>
 </metadata>
diff --git a/Source/Libs/Shared/Gapi.xsd b/Source/Libs/Shared/Gapi.xsd
index 592595a63..7ef1b8bc3 100644
--- a/Source/Libs/Shared/Gapi.xsd
+++ b/Source/Libs/Shared/Gapi.xsd
@@ -182,6 +182,7 @@
             <xs:element name="method" maxOccurs="unbounded" minOccurs="0">
                 <xs:complexType>
                     <xs:attribute name="vm" type="xs:string" use="optional"/>
+                    <xs:attribute name="padding" type="xs:string" use="optional"/>
                     <xs:attribute name="signal_vm" type="xs:string" use="optional"/>
                 </xs:complexType>
             </xs:element>
@@ -211,6 +212,7 @@
 	<xs:complexType name="fieldType">
         <xs:attribute name="name" type="xs:string"/>
         <xs:attribute name="cname" type="xs:string"/>
+        <xs:attribute name="padding" type="xs:boolean" use="optional"/>
         <xs:attribute name="type" type="xs:string"/>
         <xs:attribute name="array" type="xs:boolean" use="optional"/>
         <xs:attribute name="array_len" type="xs:positiveInteger" use="optional"/>
diff --git a/Source/Tools/GapiCodegen/ClassBase.cs b/Source/Tools/GapiCodegen/ClassBase.cs
index 0d2812114..375a79a74 100644
--- a/Source/Tools/GapiCodegen/ClassBase.cs
+++ b/Source/Tools/GapiCodegen/ClassBase.cs
@@ -252,8 +252,11 @@ namespace GtkSharp.Generation {
 				var field = _fields[i];
 				next = _fields.Count > i +1 ? _fields[i + 1] : null;
 
+
 				prev = field.Generate(gen_info, "\t\t\t\t\t", prev, next, cs_parent_struct,
 						field_alignment_structures_writer);
+				if (field.IsPadding)
+					continue;
 				var union = field as UnionABIField;
 				if (union == null && gen_info.CAbiWriter != null && !field.IsBitfield) {
 					gen_info.AbiWriter.WriteLine("\t\t\tConsole.WriteLine(\"\\\"{0}.{3}\\\": \\\"\" + {1}.{2}." + info_name + ".GetFieldOffset(\"{3}\") + \"\\\"\");", structname, NS, Name, field.CName);
diff --git a/Source/Tools/GapiCodegen/StructField.cs b/Source/Tools/GapiCodegen/StructField.cs
index a90ce2943..9fdb330f2 100644
--- a/Source/Tools/GapiCodegen/StructField.cs
+++ b/Source/Tools/GapiCodegen/StructField.cs
@@ -152,8 +152,8 @@ namespace GtkSharp.Generation {
 
 		public bool IsPadding {
 			get {
-				if (elem.GetAttributeAsBoolean ("is-padding"))
-					return elem.GetAttributeAsBoolean ("is-padding");
+				if (elem.GetAttributeAsBoolean ("padding"))
+					return elem.GetAttributeAsBoolean ("padding");
 
 				return (elem.GetAttribute ("access") == "private" && (
 					CName.StartsWith ("dummy") || CName.StartsWith ("padding")));