<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/453118736cbb47ac33da2b95636ed7d8e4444cc1">https://github.com/macports/macports-ports/commit/453118736cbb47ac33da2b95636ed7d8e4444cc1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 453118736cbb47ac33da2b95636ed7d8e4444cc1
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Oct 10 23:27:59 2024 +0700
<span style='display:block; white-space:pre;color:#404040;'> libmm-glib: new port
</span>---
comms/libmm-glib/Portfile | 84 ++++++++++++++++++++++
.../0001-mm-netlink.c-fix-include-order.patch | 28 ++++++++
...c-include-Linux-specific-headers-only-on-.patch | 28 ++++++++
.../0003-mm-port-serial-qcdm.c-fix-for-macOS.patch | 28 ++++++++
...ial.c-fix-build-when-non-POSIX-constants-.patch | 36 ++++++++++
.../files/0005-libqcdm-fix-endian-macros.patch | 53 ++++++++++++++
...-build-when-non-POSIX-constants-are-undef.patch | 36 ++++++++++
.../files/0007-libqcdm-fix-malloc-include.patch | 28 ++++++++
...ial.c-B460800-and-B921600-undefined-on-ma.patch | 33 +++++++++
...ial.c-move-Linux-specific-stuff-inside-ma.patch | 79 ++++++++++++++++++++
.../files/0010-No-netlink-on-macOS.patch | 54 ++++++++++++++
.../0011-mm-port-net.c-fix-header-for-macOS.patch | 23 ++++++
comms/libmm-glib/files/patch-meson.build.diff | 11 +++
13 files changed, 521 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/Portfile b/comms/libmm-glib/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a22d1a687a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name libmm-glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.freedesktop.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup mobile-broadband ModemManager 1.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories comms devel gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Cellular modem control and connectivity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 664e3abc5a7bca1ec979c08026b32aaf29ceec07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 772133aae2f34c12ee19751e0b61f0b8223a85beead0debd4ee42e8fc7a6dcd7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1426814
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1241
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.gnome.org/World/Chatty/-/issues/947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/910
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/913
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args-replace -p0 -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-mm-netlink.c-fix-include-order.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-mm-netlink.c-include-Linux-specific-headers-only-on-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-mm-port-serial-qcdm.c-fix-for-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-mm-port-serial.c-fix-build-when-non-POSIX-constants-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-libqcdm-fix-endian-macros.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-libqcdm-fix-build-when-non-POSIX-constants-are-undef.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-libqcdm-fix-malloc-include.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-mm-port-serial.c-B460800-and-B921600-undefined-on-ma.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0009-mm-port-serial.c-move-Linux-specific-stuff-inside-ma.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-No-netlink-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-mm-port-net.c-fix-header-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use the right python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYTHON@|${configure.python}|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/vala:vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:dbus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:bash-completion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dat_command_via_dbus=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuiltin_plugins=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dexamples=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dintrospection=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dmbim=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpolkit=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpowerd_suspend_resume=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqmi=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqrtr=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsystemd_journal=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsystemd_suspend_resume=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsystemdsystemunitdir=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtests=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dudev=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dudevdir=share/ModemManager \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapi=true
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0001-mm-netlink.c-fix-include-order.patch b/comms/libmm-glib/files/0001-mm-netlink.c-fix-include-order.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..11f4c2065ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0001-mm-netlink.c-fix-include-order.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5c7021db56b652a33b563877cf44419d08cee32c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:13:17 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/10] mm-netlink.c: fix include order
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some macOS versions require sys/socket.h to be included prior to net/if.h, otherwise it fails to compile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-netlink.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-netlink.c b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c54942be..58c3d010 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,9 +19,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/netlink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/rtnetlink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0002-mm-netlink.c-include-Linux-specific-headers-only-on-.patch b/comms/libmm-glib/files/0002-mm-netlink.c-include-Linux-specific-headers-only-on-.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6610daada4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0002-mm-netlink.c-include-Linux-specific-headers-only-on-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4c198cb15614597e08e92fce26356632339c39e6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:15:10 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/10] mm-netlink.c: include Linux-specific headers only on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-netlink.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-netlink.c b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 58c3d010..3f85ee6d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (C) 2021 Aleksander Morgado <aleksander@aleksander.es>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/netlink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/rtnetlink.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0003-mm-port-serial-qcdm.c-fix-for-macOS.patch b/comms/libmm-glib/files/0003-mm-port-serial-qcdm.c-fix-for-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..687535ceb4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0003-mm-port-serial-qcdm.c-fix-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 16b98b702681a4ada03b0b6c4b7ea80dcac98cb9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:18:06 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/10] mm-port-serial-qcdm.c: fix for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-serial-qcdm.c | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-serial-qcdm.c b/src/mm-port-serial-qcdm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 080f639f..fb14246f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-serial-qcdm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-serial-qcdm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define le16toh(x) OSSwapLittleToHostInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ModemManager.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mm-errors-types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0004-mm-port-serial.c-fix-build-when-non-POSIX-constants-.patch b/comms/libmm-glib/files/0004-mm-port-serial.c-fix-build-when-non-POSIX-constants-.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d079fa34977
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0004-mm-port-serial.c-fix-build-when-non-POSIX-constants-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 66892674a0389d367a673c472f0016ee034e89eb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:35:37 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/10] mm-port-serial.c: fix build when non-POSIX constants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ are undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-serial.c | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5053e8cc..1f4c98fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mm-log-object.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mm-helper-enums-types.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef CBAUD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CBAUD 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef IUCLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IUCLC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OLCUC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OLCUC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gboolean port_serial_queue_process (gpointer data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void port_serial_schedule_queue_process (MMPortSerial *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint timeout_ms);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0005-libqcdm-fix-endian-macros.patch b/comms/libmm-glib/files/0005-libqcdm-fix-endian-macros.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..322de44f2ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0005-libqcdm-fix-endian-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8533ebe0adf67a8b0d5cdfe417e22bda0c0dd505 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:57:22 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/10] libqcdm: fix endian macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libqcdm/src/commands.c | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libqcdm/src/logs.c | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 16 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cd21281c..1478a70c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libqcdm/src/commands.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libqcdm/src/commands.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define htole16(x) OSSwapHostToLittleInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define le16toh(x) OSSwapLittleToHostInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define htole32(x) OSSwapHostToLittleInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define le32toh(x) OSSwapLittleToHostInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "commands.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "errors.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libqcdm/src/logs.c b/libqcdm/src/logs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 91152c42..b9a2bb74 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libqcdm/src/logs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libqcdm/src/logs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define htole16(x) OSSwapHostToLittleInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define le16toh(x) OSSwapLittleToHostInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define htole32(x) OSSwapHostToLittleInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define le32toh(x) OSSwapLittleToHostInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "log-items.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "logs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0006-libqcdm-fix-build-when-non-POSIX-constants-are-undef.patch b/comms/libmm-glib/files/0006-libqcdm-fix-build-when-non-POSIX-constants-are-undef.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2df94c5225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0006-libqcdm-fix-build-when-non-POSIX-constants-are-undef.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From baacea206bc8f7bae1da2430cfc4eed3796f50be Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:58:17 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/10] libqcdm: fix build when non-POSIX constants are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libqcdm/src/com.c | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libqcdm/src/com.c b/libqcdm/src/com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d6283e06..11179a38 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libqcdm/src/com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libqcdm/src/com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "com.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "errors.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef CBAUD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CBAUD 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef IUCLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IUCLC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OLCUC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OLCUC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qcdm_port_setup (int fd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0007-libqcdm-fix-malloc-include.patch b/comms/libmm-glib/files/0007-libqcdm-fix-malloc-include.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b19b2b7ad89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0007-libqcdm-fix-malloc-include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f4275b15a5c940ff5e3bbd86d11c4322d24003fc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:59:31 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/10] libqcdm: fix malloc include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libqcdm/src/utils.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libqcdm/src/utils.c b/libqcdm/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c1ce31e..29e091eb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libqcdm/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libqcdm/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0008-mm-port-serial.c-B460800-and-B921600-undefined-on-ma.patch b/comms/libmm-glib/files/0008-mm-port-serial.c-B460800-and-B921600-undefined-on-ma.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e9f537de08e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0008-mm-port-serial.c-B460800-and-B921600-undefined-on-ma.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1eba9e73f24dce4d0ec4151abe62f2588cc7da6f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 19:16:27 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/10] mm-port-serial.c: B460800 and B921600 undefined on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See, for example: https://github.com/fixposition/fixposition_driver/issues/29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-serial.c | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1f4c98fe..7e040e50 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OLCUC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* These may not be defined in termios.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef B460800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define B460800 460800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef B921600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define B921600 921600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gboolean port_serial_queue_process (gpointer data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void port_serial_schedule_queue_process (MMPortSerial *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint timeout_ms);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0009-mm-port-serial.c-move-Linux-specific-stuff-inside-ma.patch b/comms/libmm-glib/files/0009-mm-port-serial.c-move-Linux-specific-stuff-inside-ma.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..370a11e0ee4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0009-mm-port-serial.c-move-Linux-specific-stuff-inside-ma.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 42dcc0ab8f34197c06c622a43ec39ecba8b27404 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 18:55:11 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/10] mm-port-serial.c: move Linux-specific stuff inside
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-serial.c | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e040e50..9d1f9ddd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-serial.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/serial.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gio/gunixsocketaddress.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1151,7 +1153,9 @@ mm_port_serial_open (MMPortSerial *self, GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *devfile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *device;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct serial_struct sinfo = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTimeVal tv_start, tv_end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int errno_save = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1232,6 +1236,7 @@ mm_port_serial_open (MMPortSerial *self, GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Flush any waiting IO */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcflush (self->priv->fd, TCIOFLUSH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Don't wait for pending data when closing the port; this can cause some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * stupid devices that don't respond to URBs on a particular port to hang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * for 30 seconds when probing fails. See GNOME bug #630670.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1241,6 +1246,7 @@ mm_port_serial_open (MMPortSerial *self, GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ioctl (self->priv->fd, TIOCSSERIAL, &sinfo) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mm_obj_warn (self, "couldn't set serial port closing_wait to none: %s", g_strerror (errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_warn_if_fail (MM_PORT_SERIAL_GET_CLASS (self)->config_fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1389,7 +1395,9 @@ _close_internal (MMPortSerial *self, gboolean force)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self->priv->iochannel || self->priv->socket) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTimeVal tv_start, tv_end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct serial_struct sinfo = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mm_obj_dbg (self, "closing serial port...");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1399,6 +1407,7 @@ _close_internal (MMPortSerial *self, gboolean force)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Serial port specific setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self->priv->fd >= 0 && mm_port_get_subsys (MM_PORT (self)) == MM_PORT_SUBSYS_TTY) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Paranoid: ensure our closing_wait value is still set so we ignore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * pending data when closing the port. See GNOME bug #630670.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1410,6 +1419,7 @@ _close_internal (MMPortSerial *self, gboolean force)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mm_obj_warn (self, "couldn't set serial port closing_wait to none: %s", g_strerror (errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcflush (self->priv->fd, TCIOFLUSH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0010-No-netlink-on-macOS.patch b/comms/libmm-glib/files/0010-No-netlink-on-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..663c98a69ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0010-No-netlink-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8e8d8fc6f984d0e969f42a5703613b22d3bbd86d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 9 Oct 2024 20:45:03 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/10] No netlink on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-netlink.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-net.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-netlink.c b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f85ee6d..f331de14 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-netlink.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mm-utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mm-netlink.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct _MMNetlink {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GObject parent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Netlink socket */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,3 +464,5 @@ mm_netlink_class_init (MMNetlinkClass *klass)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MM_DEFINE_SINGLETON_GETTER (MMNetlink, mm_netlink_get, MM_TYPE_NETLINK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ---------------------------------------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-net.c b/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1122ef6..0bd2518e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +50,8 @@ mm_port_net_link_setup_finish (MMPortNet *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return g_task_propagate_boolean (G_TASK (res), error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ netlink_setlink_ready (MMNetlink *netlink,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GAsyncResult *res,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,6 +97,8 @@ mm_port_net_link_setup (MMPortNet *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ task);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MMPortNet *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/0011-mm-port-net.c-fix-header-for-macOS.patch b/comms/libmm-glib/files/0011-mm-port-net.c-fix-header-for-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6834dad137
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/0011-mm-port-net.c-fix-header-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 67317a6a58e24800ad073197048260115200b175 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 8 Nov 2024 03:34:38 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] mm-port-net.c: fix header for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mm-port-net.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mm-port-net.c b/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1122ef6..b95dcade 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mm-port-net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (C) 2021 - Aleksander Morgado <aleksander@aleksander.es>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ModemManager.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libmm-glib/files/patch-meson.build.diff b/comms/libmm-glib/files/patch-meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e57a9ccb7ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libmm-glib/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/meson.build 2023-10-11 20:32:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/meson.build 2024-10-29 19:30:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnome = import('gnome')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i18n = import('i18n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg = import('pkgconfig')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('@PYTHON@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source_root = meson.current_source_dir()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_root = meson.current_build_dir()
</span></pre><pre style='margin:0'>
</pre>