Merge ~liushuyu-011/ubuntu/+source/gobject-introspection:ubuntu/devel into ubuntu/+source/gobject-introspection:ubuntu/devel

[Zixing Liu]

This merge proposal adds a patch to fix the gobject-introspection assumption that time_t and off_t are always register-width-wide.

[Steve Langasek (vorlon)]

Already uploaded via the Foundations bootstrap ppa.

review: Approve

Unmerged commits

0ee3546... by Zixing Liu on 2024-03-11

d/p/time_t-64-fix.patch: add a patch to fix time_t and off_t type ...

... mismatch after time_t 64-bit transition

a99795a... by Steve Langasek on 2024-03-08

1.79.1-1ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

44fc865... by Jeremy Bícha on 2024-03-06

1.79.1-1ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

5c0e0c1... by Jeremy Bícha on 2024-03-06

1.79.1-1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

506ce31... by Jeremy Bícha on 2024-03-06

1.79.1-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

1520f66... by Steve Langasek on 2024-03-01

1.79.1-1build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 52762b8..a96b8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gobject-introspection (1.79.1-1ubuntu6) noble; urgency=medium
+
+  * Add a patch to fix time_t and off_t size mismatch in the gi data
+
+ -- Zixing Liu <[e-mail]>  Mon, 11 Mar 2024 13:29:58 -0600
+
 gobject-introspection (1.79.1-1ubuntu5) noble; urgency=medium
 
   * Revert bootstrap changes for upload to the main archive.
diff --git a/debian/patches/series b/debian/patches/series
index 2c51846..9058acd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 meson-Only-generate-typelib-and-install-win32-files-on-wi.patch
 debian/multiarch_compat.patch
+time_t-64-fix.patch
diff --git a/debian/patches/time_t-64-fix.patch b/debian/patches/time_t-64-fix.patch
 new file mode 100644
index 0000000..fc79292
--- /dev/null
+++ b/debian/patches/time_t-64-fix.patch
@@ -0,0 +1,185 @@
+From 2fae19987660db2c0e1d66294b20f911808ccc5c Mon Sep 17 00:00:00 2001
+From: liushuyu <[e-mail]>
+Date: Mon, 11 Mar 2024 12:48:54 -0600
+Subject: giscanner: treat time_t and off_t as standalone types ...
+
+... also configure them to be platform-dependently sized
+Forwarded: https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/451
+---
+ girepository/girparser.c | 2 ++
+ giscanner/ast.py         | 9 ++++++---
+ giscanner/docwriter.py   | 4 +++-
+ meson.build              | 8 ++++++--
+ 4 files changed, 17 insertions(+), 6 deletions(-)
+
+Index: gobject-introspection-1.79.1/girepository/girparser.c
+===================================================================
+--- gobject-introspection-1.79.1.orig/girepository/girparser.c
++++ gobject-introspection-1.79.1/girepository/girparser.c
+@@ -445,6 +445,8 @@ static IntegerAliasInfo integer_aliases[
+   { "guint",    SIZEOF_INT,       0 },
+   { "glong",    SIZEOF_LONG,      1 },
+   { "gulong",   SIZEOF_LONG,      0 },
++  { "off_t",    SIZEOF_OFF_T,     1 },
++  { "time_t",   SIZEOF_TIME_T,    1 },
+   { "gssize",   GLIB_SIZEOF_SIZE_T,    1 },
+   { "gsize",    GLIB_SIZEOF_SIZE_T,    0 },
+   { "gintptr",  GLIB_SIZEOF_SIZE_T,    1 },
+Index: gobject-introspection-1.79.1/giscanner/ast.py
+===================================================================
+--- gobject-introspection-1.79.1.orig/giscanner/ast.py
++++ gobject-introspection-1.79.1/giscanner/ast.py
+@@ -231,6 +231,9 @@ TYPE_DOUBLE = Type(target_fundamental='g
+ TYPE_LONG_DOUBLE = Type(target_fundamental='long double',
+                         ctype='long double')
+ TYPE_UNICHAR = Type(target_fundamental='gunichar', ctype='gunichar')
++# Platform-specific types
++TYPE_TIME_T = Type(target_fundamental='time_t', ctype='time_t')
++TYPE_OFF_T = Type(target_fundamental='off_t', ctype='off_t')
+ 
+ # C types with semantics overlaid
+ TYPE_GTYPE = Type(target_fundamental='GType', ctype='GType')
+@@ -243,7 +246,7 @@ BASIC_TYPES = [TYPE_BOOLEAN, TYPE_INT8,
+                TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64,
+                TYPE_UINT64, TYPE_CHAR, TYPE_SHORT, TYPE_USHORT, TYPE_INT,
+                TYPE_UINT, TYPE_LONG, TYPE_ULONG, TYPE_SIZE, TYPE_SSIZE,
+-               TYPE_LONG_LONG, TYPE_LONG_ULONG,
++               TYPE_LONG_LONG, TYPE_LONG_ULONG, TYPE_TIME_T, TYPE_OFF_T,
+                TYPE_FLOAT, TYPE_DOUBLE,
+                TYPE_LONG_DOUBLE, TYPE_UNICHAR, TYPE_GTYPE]
+ 
+@@ -344,8 +347,8 @@ type_names['size_t'] = type_names['gsize
+ type_names['ssize_t'] = type_names['gssize']
+ type_names['uintptr_t'] = type_names['guintptr']
+ type_names['intptr_t'] = type_names['gintptr']
+-type_names['time_t'] = TYPE_LONG
+-type_names['off_t'] = type_names['gsize']
++type_names['time_t'] = TYPE_TIME_T
++type_names['off_t'] = TYPE_OFF_T
+ type_names['pid_t'] = TYPE_INT
+ type_names['uid_t'] = TYPE_UINT
+ type_names['gid_t'] = TYPE_UINT
+Index: gobject-introspection-1.79.1/giscanner/docwriter.py
+===================================================================
+--- gobject-introspection-1.79.1.orig/giscanner/docwriter.py
++++ gobject-introspection-1.79.1/giscanner/docwriter.py
+@@ -782,6 +782,8 @@ class DocFormatterPython(DocFormatterInt
+             "gulong": "int",
+             "gint64": "int",
+             "guint64": "int",
++            "time_t": "int",
++            "off_t": "int",
+             "gfloat": "float",
+             "gdouble": "float",
+             "gchararray": "str",
+@@ -923,6 +925,8 @@ class DocFormatterGjs(DocFormatterIntros
+             "gulong": "Number(gulong)",
+             "gint64": "Number(gint64)",
+             "guint64": "Number(guint64)",
++            "time_t": "Number(time_t)",
++            "off_t": "Number(off_t)",
+             "long double": "Number(long double)",
+             "long long": "Number(long long)",
+             "unsigned long long": "Number(unsigned long long)"}
+@@ -1149,7 +1153,7 @@ class DevDocsFormatterGjs(DocFormatterGj
+                     "gchar", "guchar", "gshort", "gint", "guint", "gfloat",
+                     "gdouble", "gsize", "gssize", "gintptr", "guintptr",
+                     "glong", "gulong", "gint64", "guint64", "long double",
+-                    "long long", "unsigned long long"]:
++                    "long long", "unsigned long long", "time_t", "off_t"]:
+             return "Number"  # gsize and up cannot fully be represented in GJS
+         if name in ["none", "gpointer"]:
+             return "void"
+Index: gobject-introspection-1.79.1/meson.build
+===================================================================
+--- gobject-introspection-1.79.1.orig/meson.build
++++ gobject-introspection-1.79.1/meson.build
+@@ -101,8 +101,12 @@ config.set_quoted('GOBJECT_INTROSPECTION
+ config.set_quoted('GIR_DIR', girdir)
+ config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+ 
+-foreach type : ['char', 'short', 'int', 'long']
+-  size = cc.sizeof(type)
++foreach type : ['char', 'short', 'int', 'long', 'off_t', 'time_t']
++  if type == 'time_t'
++    size = cc.sizeof(type, prefix: '#include <time.h>')
++  else
++    size = cc.sizeof(type)
++  endif
+   if size == -1
+     error('Failed to get size of @0@'.format(type))
+   endif
+Index: gobject-introspection-1.79.1/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
+===================================================================
+--- gobject-introspection-1.79.1.orig/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
++++ gobject-introspection-1.79.1/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
+@@ -13,14 +13,14 @@
+       </api:returns>
+       <api:name>regress_foo_object_is_it_time_yet</api:name>
+       <api:arg>
+-        <api:type>Number(glong)</api:type>
++        <api:type>Number(time_t)</api:type>
+         <api:name>time</api:name>
+       </api:arg>
+     </api:function>
+   </info>
+   <title>Regress.FooObject.prototype.is_it_time_yet</title>
+   <synopsis><code mime="text/x-gjs">
+-function is_it_time_yet(time: Number(glong)): void {
++function is_it_time_yet(time: Number(time_t)): void {
+     // Gjs wrapper for regress_foo_object_is_it_time_yet()
+ }
+   </code></synopsis>
+Index: gobject-introspection-1.79.1/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
+===================================================================
+--- gobject-introspection-1.79.1.orig/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
++++ gobject-introspection-1.79.1/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
+@@ -9,18 +9,18 @@
+     <link xref="index" group="function" type="guide"/>
+     <api:function>
+       <api:returns>
+-        <api:type>Number(glong)</api:type>
++        <api:type>Number(time_t)</api:type>
+       </api:returns>
+       <api:name>regress_test_timet</api:name>
+       <api:arg>
+-        <api:type>Number(glong)</api:type>
++        <api:type>Number(time_t)</api:type>
+         <api:name>in</api:name>
+       </api:arg>
+     </api:function>
+   </info>
+   <title>Regress.test_timet</title>
+   <synopsis><code mime="text/x-gjs">
+-function test_timet(in: Number(glong)): Number(glong) {
++function test_timet(in: Number(time_t)): Number(time_t) {
+     // Gjs wrapper for regress_test_timet()
+ }
+   </code></synopsis>
+Index: gobject-introspection-1.79.1/tests/scanner/Regress-1.0-expected.gir
+===================================================================
+--- gobject-introspection-1.79.1.orig/tests/scanner/Regress-1.0-expected.gir
++++ gobject-introspection-1.79.1/tests/scanner/Regress-1.0-expected.gir
+@@ -2034,7 +2034,7 @@ uses a C sugar return type.</doc>
+             <type name="FooObject" c:type="RegressFooObject*"/>
+           </instance-parameter>
+           <parameter name="time" transfer-ownership="none">
+-            <type name="glong" c:type="time_t"/>
++            <type name="time_t" c:type="time_t"/>
+           </parameter>
+         </parameters>
+       </method>
+@@ -8675,11 +8675,11 @@ https://bugzilla.gnome.org/show_bug.cgi?
+     <function name="test_timet" c:identifier="regress_test_timet">
+       <source-position filename="regress.h" line="94"/>
+       <return-value transfer-ownership="none">
+-        <type name="glong" c:type="time_t"/>
++        <type name="time_t" c:type="time_t"/>
+       </return-value>
+       <parameters>
+         <parameter name="in" transfer-ownership="none">
+-          <type name="glong" c:type="time_t"/>
++          <type name="time_t" c:type="time_t"/>
+         </parameter>
+       </parameters>
+     </function>