Hello community, here is the log from the commit of package ModemManager for openSUSE:Factory checked in at 2016-05-31 12:09:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ModemManager (Old) and /work/SRC/openSUSE:Factory/.ModemManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ModemManager" Changes: -------- --- /work/SRC/openSUSE:Factory/ModemManager/ModemManager.changes 2016-04-15 18:56:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ModemManager.new/ModemManager.changes 2016-05-31 12:09:04.000000000 +0200 @@ -1,0 +2,15 @@ +Mon May 23 14:58:36 UTC 2016 - dims...@opensuse.org + +- Add three more patches from upstream to fix build with gcc6: + + ModemManager-cinterion_drop_unused_constants.patch. + + ModemManager-novatel_remove_unused_custom_AT_probe_array.patch. + + ModemManager-wmc_fix_typo.patch. + +------------------------------------------------------------------- +Mon May 23 13:42:39 UTC 2016 - dims...@opensuse.org + +- Add ModemManager-fix-whitespaces.patch: Fix whitespace usage. + While building with GCC 6, the indenting is taken as a warning + for the user likely making a mistake. + +------------------------------------------------------------------- New: ---- ModemManager-cinterion_drop_unused_constants.patch ModemManager-fix-whitespaces.patch ModemManager-novatel_remove_unused_custom_AT_probe_array.patch ModemManager-wmc_fix_typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ModemManager.spec ++++++ --- /var/tmp/diff_new_pack.XQKghf/_old 2016-05-31 12:09:05.000000000 +0200 +++ /var/tmp/diff_new_pack.XQKghf/_new 2016-05-31 12:09:05.000000000 +0200 @@ -27,6 +27,15 @@ Source0: http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE ModemManager-1.0.0-systemd-activation.patch bnc#892682 lnus...@suse.de -- Fix systemd dbus activation Patch0: ModemManager-1.0.0-systemd-activation.patch +# PATCH-FIX-UPSTREAM ModemManager-fix-whitespaces.patch dims...@opensuse.org -- Fix whitespace usage, allows building with gcc6 +Patch1: ModemManager-fix-whitespaces.patch +# PATCH-FIX-UPSTREAM ModemManager-cinterion_drop_unused_constants.patch dims...@opensuse.org -- cinterion: drop unused constants (fix gcc6 build) +Patch2: ModemManager-cinterion_drop_unused_constants.patch +# PATCH-FIX-UPSTREAM ModemManager-novatel_remove_unused_custom_AT_probe_array.patch dims...@opensuse.org -- novatel: remove unused custom AT probe array (fix gcc6 build) +Patch3: ModemManager-novatel_remove_unused_custom_AT_probe_array.patch +# PATCH-FIX-UPSTREAM ModemManager-wmc_fix_typo.patch dims...@opensuse.org -- wmc: fix typo (fix gcc6 build) +Patch4: ModemManager-wmc_fix_typo.patch + BuildRequires: dbus-1-glib-devel BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: hicolor-icon-theme @@ -86,6 +95,10 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build pppddir=`ls -1d %{_libdir}/pppd/2*` ++++++ ModemManager-cinterion_drop_unused_constants.patch ++++++ >From 342ea24e346f855f57c69a7fc1fccbbf4e12277d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkund...@v3.sk> Date: Mon, 21 Mar 2016 14:58:41 +0100 Subject: cinterion: drop unused constants GCC 6 doesn't like this. Unused since f2024b7. diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c index f0fa630..4882a41 100644 --- a/plugins/cinterion/mm-broadband-modem-cinterion.c +++ b/plugins/cinterion/mm-broadband-modem-cinterion.c @@ -71,30 +71,6 @@ struct _MMBroadbandModemCinterionPrivate { GArray *cnmi_supported_bfr; }; -/* Setup relationship between the band bitmask in the modem and the bitmask - * in ModemManager. */ -typedef struct { - gchar *cinterion_band; - guint n_mm_bands; - MMModemBand mm_bands [4]; -} CinterionBand2G; - -/* Table checked in both MC75i (GPRS/EDGE) and EGS5 (GPRS) references. - * Note that the modem's configuration is also based on a bitmask, but as we - * will just support some of the combinations, we just use strings for them. - */ -static const CinterionBand2G bands_2g[] = { - { "1", 1, { MM_MODEM_BAND_EGSM, 0, 0, 0 }}, - { "2", 1, { MM_MODEM_BAND_DCS, 0, 0, 0 }}, - { "4", 1, { MM_MODEM_BAND_PCS, 0, 0, 0 }}, - { "8", 1, { MM_MODEM_BAND_G850, 0, 0, 0 }}, - { "3", 2, { MM_MODEM_BAND_EGSM, MM_MODEM_BAND_DCS, 0, 0 }}, - { "5", 2, { MM_MODEM_BAND_EGSM, MM_MODEM_BAND_PCS, 0, 0 }}, - { "10", 2, { MM_MODEM_BAND_G850, MM_MODEM_BAND_DCS, 0, 0 }}, - { "12", 2, { MM_MODEM_BAND_G850, MM_MODEM_BAND_PCS, 0, 0 }}, - { "15", 4, { MM_MODEM_BAND_EGSM, MM_MODEM_BAND_DCS, MM_MODEM_BAND_PCS, MM_MODEM_BAND_G850 }} -}; - /*****************************************************************************/ /* Unsolicited events enabling */ -- cgit v0.10.2 ++++++ ModemManager-fix-whitespaces.patch ++++++ >From 99ae6777893d0b149cbefac3f290c63c47e29f42 Mon Sep 17 00:00:00 2001 From: Dan Williams <d...@redhat.com> Date: Wed, 13 Jan 2016 15:29:50 -0600 Subject: libqcdm: fix mixed whitespace in test-qcdm.c diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c index 2a21522..59ca3a8 100644 --- a/libqcdm/tests/test-qcdm.c +++ b/libqcdm/tests/test-qcdm.c @@ -35,15 +35,15 @@ typedef GTestFixtureFunc TCFunc; static TestData * test_data_new (const char *port) { - TestData *d; + TestData *d; - d = g_malloc0 (sizeof (TestData)); - g_assert (d); + d = g_malloc0 (sizeof (TestData)); + g_assert (d); if (port) d->com_data = test_com_setup (port); - return d; + return d; } static void @@ -52,7 +52,7 @@ test_data_free (TestData *d) if (d->com_data) test_com_teardown (d->com_data); - g_free (d); + g_free (d); } int main (int argc, char **argv) @@ -118,9 +118,9 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test_com_gsm_subsys_state_info, data->com_data)); } - result = g_test_run (); + result = g_test_run (); - test_data_free (data); + test_data_free (data); - return result; + return result; } -- cgit v0.10.2 ++++++ ModemManager-novatel_remove_unused_custom_AT_probe_array.patch ++++++ >From 6fb83b5e029134ab9844f05517a444f2df501773 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado <aleksan...@aleksander.es> Date: Fri, 6 Feb 2015 15:29:52 +0100 Subject: novatel: remove unused custom AT probe array diff --git a/plugins/novatel/mm-plugin-novatel.c b/plugins/novatel/mm-plugin-novatel.c index 9eaf285..b57c0e8 100644 --- a/plugins/novatel/mm-plugin-novatel.c +++ b/plugins/novatel/mm-plugin-novatel.c @@ -42,19 +42,6 @@ int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; /*****************************************************************************/ -/* Custom commands for AT probing */ - -/* We need to explicitly flip secondary ports to AT mode. - * We also use this command also for checking AT support in the current port. - */ -static const MMPortProbeAtCommand custom_at_probe[] = { - { "$NWDMAT=1", 3, mm_port_probe_response_processor_is_at }, - { "$NWDMAT=1", 3, mm_port_probe_response_processor_is_at }, - { "$NWDMAT=1", 3, mm_port_probe_response_processor_is_at }, - { NULL } -}; - -/*****************************************************************************/ /* Custom init */ typedef struct { -- cgit v0.10.2 ++++++ ModemManager-wmc_fix_typo.patch ++++++ >From 2a5909af17324442e052d3833ac7d4ff0ab689ba Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkund...@v3.sk> Date: Mon, 21 Mar 2016 14:58:40 +0100 Subject: wmc: fix a typo in the test GCC 6 notices an unused constant and errors out. diff --git a/libwmc/tests/test-wmc-utils.c b/libwmc/tests/test-wmc-utils.c index 49d7351..93c2a6a 100644 --- a/libwmc/tests/test-wmc-utils.c +++ b/libwmc/tests/test-wmc-utils.c @@ -128,8 +128,8 @@ test_utils_encapsulate_uml290_wmc1 (void *f, void *data) memcpy (inbuf, uml290_encap_src, sizeof (uml290_encap_src)); encap_len = wmc_encapsulate (inbuf, sizeof (uml290_encap_src), sizeof (inbuf), outbuf, sizeof (outbuf), TRUE); - g_assert (encap_len == sizeof (encap_outbuf)); - g_assert (memcmp (outbuf, encap_outbuf, encap_len) == 0); + g_assert (encap_len == sizeof (uml290_encap_outbuf)); + g_assert (memcmp (outbuf, uml290_encap_outbuf, encap_len) == 0); } static const char uml290_src[] = { -- cgit v0.10.2
