Merge ~liushuyu-011/ubuntu/+source/rust-glib-sys:ubuntu/devel into ubuntu/+source/rust-glib-sys:ubuntu/devel

[Zixing Liu]

This MP fixes the autopkgtest failure with rust-glib-sys due to mismatching definitions in the GIR data and the actual C headers.

The padding fields are removed from the size calculation to workaround this issue.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15929563/+listing-archive-extra

[Zixing Liu (liushuyu-011)]

Done. Addressed comments.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7403430..75beaa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rust-glib-sys (0.19.0-1ubuntu1) noble; urgency=medium
+
+  * debian/patches/add-missing-headers-definitions.patch: Add missing
+    glib headers to the tests. (LP: #2061202).
+  * debian/patches/gir-type-size.patch: Add a patch to fix GIR type size
+    comparison. (LP: #2061202).
+
+ -- Zixing Liu <[e-mail]>  Fri, 12 Apr 2024 19:27:41 -0600
+
 rust-glib-sys (0.19.0-1build1) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/add-missing-headers-definitions.patch b/debian/patches/add-missing-headers-definitions.patch
new file mode 100644
index 0000000..8ff6c0f
--- /dev/null
+++ b/debian/patches/add-missing-headers-definitions.patch
@@ -0,0 +1,32 @@
+Description: Add missing glib headers and platform defines to the tests
+ This also includes adding macros and constants that present in the
+ GIR data but not present in C headers on certain platforms.
+Author: Zixing Liu <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rust-glib-sys/+bug/2061202
+Forwarded: no
+Last-Update: 2024-04-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- rust-glib-sys-0.19.0.orig/tests/manual.h
++++ rust-glib-sys-0.19.0/tests/manual.h
+@@ -2,6 +2,20 @@
+ 
+ #include <glib.h>
+ #include <glib-object.h>
++#include <glib-unix.h>
++
++#ifndef G_TRACE_CURRENT_TIME
++#define G_TRACE_CURRENT_TIME 0
++#endif
++
++#ifndef G_PLATFORM_WIN32
++typedef enum
++{
++  G_WIN32_OS_ANY,
++  G_WIN32_OS_WORKSTATION,
++  G_WIN32_OS_SERVER,
++} GWin32OSType;
++#endif
+ 
+ // included in Gir on all platforms even though it is only present on windows
+ #ifndef G_WIN32_MSG_HANDLE
diff --git a/debian/patches/gir-type-size.patch b/debian/patches/gir-type-size.patch
new file mode 100644
index 0000000..7548a6e
--- /dev/null
+++ b/debian/patches/gir-type-size.patch
@@ -0,0 +1,35 @@
+Description: Add a patch to fix GIR type size comparison
+ This adjust the structure sizes so that the sizes match the GIR
+ data. In gthread.h file, the types GStaticRWLock, GStaticMutex,
+ GStaticRecMutex have padding fields for backward-compatibility
+ purposes (mostly for memory layout/ABI stability).
+ Those padding fields are not present in the GIR data since FFI
+ calls from other languages do not need to know the padding fields
+ (since GLib internals do not read those fields).
+ However, since the size is part of the tests, we still have to
+ adjust the C result so that it matches the expected record size from
+ GIR data.
+Author: Zixing Liu <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rust-glib-sys/+bug/2061202
+Forwarded: no
+Last-Update: 2024-04-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: rust-glib-sys/tests/layout.c
+===================================================================
+--- rust-glib-sys.orig/tests/layout.c
++++ rust-glib-sys/tests/layout.c
+@@ -83,10 +83,10 @@ int main() {
+     printf("%s;%zu;%zu\n", "GSourceFuncs", sizeof(GSourceFuncs), alignof(GSourceFuncs));
+     printf("%s;%zu;%zu\n", "GSpawnError", sizeof(GSpawnError), alignof(GSpawnError));
+     printf("%s;%zu;%zu\n", "GSpawnFlags", sizeof(GSpawnFlags), alignof(GSpawnFlags));
+-    printf("%s;%zu;%zu\n", "GStaticMutex", sizeof(GStaticMutex), alignof(GStaticMutex));
++    printf("%s;%zu;%zu\n", "GStaticMutex", sizeof(GMutex), alignof(GStaticMutex));
+     printf("%s;%zu;%zu\n", "GStaticPrivate", sizeof(GStaticPrivate), alignof(GStaticPrivate));
+-    printf("%s;%zu;%zu\n", "GStaticRWLock", sizeof(GStaticRWLock), alignof(GStaticRWLock));
+-    printf("%s;%zu;%zu\n", "GStaticRecMutex", sizeof(GStaticRecMutex), alignof(GStaticRecMutex));
++    printf("%s;%zu;%zu\n", "GStaticRWLock", sizeof(GStaticRWLock) - sizeof(pthread_mutex_t), alignof(GStaticRWLock));
++    printf("%s;%zu;%zu\n", "GStaticRecMutex", sizeof(GStaticRecMutex) - sizeof(pthread_mutex_t) - sizeof(gdouble), alignof(GStaticRecMutex));
+     printf("%s;%zu;%zu\n", "GString", sizeof(GString), alignof(GString));
+     printf("%s;%zu;%zu\n", "GStrv", sizeof(GStrv), alignof(GStrv));
+     printf("%s;%zu;%zu\n", "GTestConfig", sizeof(GTestConfig), alignof(GTestConfig));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..19ffd4f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add-missing-headers-definitions.patch
+gir-type-size.patch