diff -pruN 1.32.0-1/debian/changelog 1.32.0-1ubuntu2/debian/changelog --- 1.32.0-1/debian/changelog 2022-10-28 13:46:11.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/changelog 2022-11-22 10:01:07.000000000 +0000 @@ -1,3 +1,11 @@ +libqmi (1.32.0-1ubuntu2) lunar; urgency=medium + + * Build without libqrtr for now, the MIR is blocked since we don't have + hardware available to do the required testing of the feature, + include some workarounds to fix the build + + -- Sebastien Bacher Tue, 22 Nov 2022 11:01:07 +0100 + libqmi (1.32.0-1) unstable; urgency=medium * New upstream version 1.32.0 diff -pruN 1.32.0-1/debian/control 1.32.0-1ubuntu2/debian/control --- 1.32.0-1/debian/control 2022-10-28 13:46:11.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/control 2022-11-22 09:38:54.000000000 +0000 @@ -1,6 +1,7 @@ Source: libqmi Priority: optional -Maintainer: DebianOnMobile Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: DebianOnMobile Maintainers Uploaders: Arnaud Ferraris , Guido Günther , Henry-Nicolas Tourneur , @@ -14,7 +15,6 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, libgudev-1.0-dev, libmbim-glib-dev, - libqrtr-glib-dev (>= 1.0.0), meson, pkg-config, Build-Depends-Indep: libglib2.0-doc @@ -33,7 +33,6 @@ Depends: ${misc:Depends}, gir1.2-qmi-1.0 (= ${binary:Version}), libqmi-glib5 (= ${binary:Version}), libglib2.0-dev, - libqrtr-glib-dev, Suggests: libqmi-glib-doc, Description: Header files for adding QMI support to applications that use glib This package contains the header and pkg-config files for development diff -pruN 1.32.0-1/debian/libqmi-glib5.symbols 1.32.0-1ubuntu2/debian/libqmi-glib5.symbols --- 1.32.0-1/debian/libqmi-glib5.symbols 2022-10-28 13:46:11.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/libqmi-glib5.symbols 2022-11-22 09:38:54.000000000 +0000 @@ -590,7 +590,6 @@ libqmi-glib.so.5 libqmi-glib5 #MINVER#, qmi_device_get_consecutive_timeouts@Base 1.32.0 qmi_device_get_expected_data_format@Base 1.14.0 qmi_device_get_file@Base 1.6.0 - qmi_device_get_node@Base 1.30.4 qmi_device_get_path@Base 1.6.0 qmi_device_get_path_display@Base 1.6.0 qmi_device_get_service_version_info@Base 1.6.0 @@ -601,14 +600,11 @@ libqmi-glib.so.5 libqmi-glib5 #MINVER#, qmi_device_list_links@Base 1.28.6 qmi_device_new@Base 1.6.0 qmi_device_new_finish@Base 1.6.0 - qmi_device_new_from_node@Base 1.30.4 - qmi_device_new_from_node_finish@Base 1.30.4 qmi_device_open@Base 1.6.0 qmi_device_open_finish@Base 1.6.0 qmi_device_open_flags_build_string_from_mask@Base 1.10.0 qmi_device_open_flags_get_type@Base 1.10.0 qmi_device_peek_file@Base 1.6.0 - qmi_device_peek_node@Base 1.30.4 qmi_device_release_client@Base 1.6.0 qmi_device_release_client_finish@Base 1.6.0 qmi_device_release_client_flags_build_string_from_mask@Base 1.10.0 @@ -688,8 +684,6 @@ libqmi-glib.so.5 libqmi-glib5 #MINVER#, qmi_endpoint_parse_buffer@Base 1.24.6 qmi_endpoint_qmux_get_type@Base 1.24.6 qmi_endpoint_qmux_new@Base 1.24.6 - qmi_endpoint_qrtr_get_type@Base 1.30.4 - qmi_endpoint_qrtr_new@Base 1.30.4 qmi_endpoint_send@Base 1.24.6 qmi_endpoint_setup_indications@Base 1.24.6 qmi_endpoint_setup_indications_finish@Base 1.24.6 diff -pruN 1.32.0-1/debian/patches/series 1.32.0-1ubuntu2/debian/patches/series --- 1.32.0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/patches/series 2022-11-22 09:38:54.000000000 +0000 @@ -0,0 +1 @@ +workaround_noqrtr_build.patch diff -pruN 1.32.0-1/debian/patches/workaround_noqrtr_build.patch 1.32.0-1ubuntu2/debian/patches/workaround_noqrtr_build.patch --- 1.32.0-1/debian/patches/workaround_noqrtr_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/patches/workaround_noqrtr_build.patch 2022-11-22 09:38:54.000000000 +0000 @@ -0,0 +1,16 @@ +Index: libqmi-1.31~git20220823/src/libqmi-glib/qmi-device.c +=================================================================== +--- libqmi-1.31~git20220823.orig/src/libqmi-glib/qmi-device.c ++++ libqmi-1.31~git20220823/src/libqmi-glib/qmi-device.c +@@ -3448,11 +3448,6 @@ qmi_device_class_init (QmiDeviceClass *k + G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_CONSECUTIVE_TIMEOUTS, properties[PROP_CONSECUTIVE_TIMEOUTS]); + +- /** +- * QmiDevice:device-node: +- * +- * Since: 1.24 +- */ + #if QMI_QRTR_SUPPORTED + properties[PROP_NODE] = + g_param_spec_object (QMI_DEVICE_NODE, diff -pruN 1.32.0-1/debian/rules 1.32.0-1ubuntu2/debian/rules --- 1.32.0-1/debian/rules 2022-10-28 13:46:11.000000000 +0000 +++ 1.32.0-1ubuntu2/debian/rules 2022-11-22 09:38:54.000000000 +0000 @@ -16,7 +16,7 @@ CONFIGURE_FLAGS += -Dgtk_doc=false endif override_dh_auto_configure: - dh_auto_configure -- -Ddefault_library=both $(CONFIGURE_FLAGS) + dh_auto_configure -- -Ddefault_library=both $(CONFIGURE_FLAGS) -Dqrtr=false override_dh_missing: dh_missing -X.la