Imported Upstream version 1.68.0

diff --git a/NEWS b/NEWS
index cbcb1e6..28e21cb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+1.68.0 - 2021-03-19
+-------------------
+
+* Update GLib annotations :mr:`262`
+* docs: cleanup :mr:`261`
+* Fix syntax errors in gir-1.2.rnc :mr:`256`
+
 1.67.1 - 2021-03-12
 -------------------
 

diff --git a/README.rst b/README.rst
index b8e82a9..f146131 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -63,5 +63,5 @@ Bugs should be reported in https://gitlab.gnome.org/GNOME/gobject-introspection/
 
 Contact
 -------
-:Mail: gtk-devel-list@gnome.org
-:IRC: #introspection@irc.gnome.org
\ No newline at end of file
+:Discourse: https://discourse.gnome.org/tag/introspection
+:IRC: #introspection@irc.gnome.org

diff --git a/docs/gir-1.2.rnc b/docs/gir-1.2.rnc
index 6fa656c..a647811 100644 (file)
--- a/docs/gir-1.2.rnc
+++ b/docs/gir-1.2.rnc
@@ -262,18 +262,18 @@ grammar {
       attribute xml:whitespace { "preserve" }?,
       ## the text of the version of the documentation
       text
-    }?
+    }? &
     ## give the stability of the documentation
-    & element doc-stability {
+    element doc-stability {
       ## Preserve the original formatting of the documentation from the source code
       attribute xml:space { "preserve" }?,
       ## Preserve the original formatting of the documentation from the source code. Recommended to use this instead of xml:space
       attribute xml:whitespace { "preserve" }?,
       ## a text value about the stability of the documentation. Usually a simple description like stable or unstable
       text
-    }?
+    }? &
     ## documentation of an element
-    & element doc {
+    element doc {
       ## Preserve the original formatting of the documentation from the source code
       attribute xml:space { "preserve" }?,
       ## Keep the whitespace as they were in the source code
@@ -286,24 +286,24 @@ grammar {
       attribute column { xsd:string },
       ## the text of the documentation
       text
-    }?
+    }? &
     ## Deprecated documentation of an element. Kept for historical reasons in general
-    & element doc-deprecated {
+    element doc-deprecated {
       ## Preserve the original formatting of the documentation from the source code
       attribute xml:space { "preserve" }?,
       ## Keep the whitespace as they were in the source code
       attribute xml:whitespace { "preserve" }?,
       ## the text of the deprecated documentation
       text
-    }?
+    }? &
     ## Position of the documentation in the original source code
-    & element source-position {
+    element source-position {
       ## File name of the source of the documentation
       attribute filename { xsd:string },
       ## The first line of the documentation in the source code
       attribute line { xsd:string },
       ## The first column of the documentation in the source code
-      attribute column { xsd:string },
+      attribute column { xsd:string }
     }?
   )
 
@@ -532,10 +532,10 @@ grammar {
 
         (DocElements
          & (AnyType | VarArgs))
-      }*
+      }* &
 
       ## instance-parameter is a parameter of a C function which is an instance of an existing object. So the callable is surely a method of a class, and this parameter points to the instance of the object. In C++, this would be equivalent to the pointer this which is not passed to the method, in Python it's equivalent to self.
-      & element instance-parameter {
+      element instance-parameter {
         ## name of the instance-parameter
         attribute name { xsd:string },
         ## Binary attribute, true if the parameter can have a null value

diff --git a/docs/website/index.rst b/docs/website/index.rst
index 7ac7415..4399091 100644 (file)
--- a/docs/website/index.rst
+++ b/docs/website/index.rst
@@ -69,5 +69,5 @@ Contact
 
 For questions or additional information, please use:
 
-* Mailing list: gtk-devel-list@gnome.org
+* Discourse: https://discourse.gnome.org/tag/introspection
 * IRC: #introspection on irc.gnome.org

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 6ddbaed..c1ffdd0 100644 (file)
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -13475,8 +13475,11 @@
  *
  * Creates a new icon for a bytes.
  *
+ * This cannot fail, but loading and interpreting the bytes may fail later on
+ * (for example, if g_loadable_icon_load() is called) if the image is invalid.
+ *
  * Returns: (transfer full) (type GBytesIcon): a #GIcon for the given
- *   @bytes, or %NULL on error.
+ *   @bytes.
  * Since: 2.38
  */
 

diff --git a/gobject-introspection.doap b/gobject-introspection.doap
index 6e59acc..c0f3a64 100644 (file)
--- a/gobject-introspection.doap
+++ b/gobject-introspection.doap
@@ -16,7 +16,6 @@
   <homepage rdf:resource="https://gi.readthedocs.io/" />
   <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
   <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gobject-introspection/issues/" />
-  <mailing-list rdf:resource="mailto:gtk-devel-list@gnome.org" />
 
   <programming-language>C</programming-language>
   <programming-language>Python</programming-language>

diff --git a/meson.build b/meson.build
index 5f8c2a6..e5205e3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gobject-introspection', 'c',
-  version: '1.67.1',
+  version: '1.68.0',
   meson_version: '>= 0.50.1',
   default_options: [
     'warning_level=1',