Package: modemmanager User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu cosmic ubuntu-patch Version: 1.7.990-1 Severity: normal Tags: patch
- Pass --enable-more-warnings so we build without -Werror. Patch m4/compiler_warnings.m4 to allow this. thanks for considering the patch (the patch is now merged upstream, just a little change in rules file will be needed on next release) Gianfranco
diff -Nru modemmanager-1.7.990/debian/changelog modemmanager-1.7.990/debian/changelog --- modemmanager-1.7.990/debian/changelog 2018-03-01 15:20:02.000000000 +0100 +++ modemmanager-1.7.990/debian/changelog 2018-06-06 16:34:06.000000000 +0200 @@ -1,3 +1,11 @@ +modemmanager (1.7.990-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Pass --enable-more-warnings so we build without -Werror. Patch + m4/compiler_warnings.m4 to allow this. + + -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 06 Jun 2018 16:34:06 +0200 + modemmanager (1.7.990-1) unstable; urgency=medium * New upstream version 1.7.990. @@ -19,6 +27,13 @@ -- Mathieu Trudel-Lapierre <mathieu...@gmail.com> Thu, 01 Mar 2018 09:20:02 -0500 +modemmanager (1.6.8-2ubuntu1) bionic; urgency=medium + + * Pass --enable-more-warnings so we build without -Werror. Patch + m4/compiler_warnings.m4 to allow this. + + -- Iain Lane <i...@orangesquash.org.uk> Tue, 24 Apr 2018 12:06:03 +0100 + modemmanager (1.6.8-2) unstable; urgency=medium * Remove myself from Uploaders and re-instate Mathieu Trudel-Lapierre as diff -Nru modemmanager-1.7.990/debian/patches/0001-m4-compiler_warnings.m4-Let-Werror-be-disabled.patch modemmanager-1.7.990/debian/patches/0001-m4-compiler_warnings.m4-Let-Werror-be-disabled.patch --- modemmanager-1.7.990/debian/patches/0001-m4-compiler_warnings.m4-Let-Werror-be-disabled.patch 1970-01-01 01:00:00.000000000 +0100 +++ modemmanager-1.7.990/debian/patches/0001-m4-compiler_warnings.m4-Let-Werror-be-disabled.patch 2018-04-24 13:06:03.000000000 +0200 @@ -0,0 +1,49 @@ +From 1a7bcaa7bbad8b2e6a220e6780f5a7b0ec390c0d Mon Sep 17 00:00:00 2001 +From: Iain Lane <ia...@gnome.org> +Date: Tue, 24 Apr 2018 12:31:44 +0100 +Subject: [PATCH] m4/compiler_warnings.m4: Let -Werror be disabled + +It's annoying for distributors to build with -Werror, since it means +that compiler upgrades can break the build. Let's let them disable it, +but keep it enabled by default. + +Origin: vendor, Ubuntu +Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=106208 + +--- + m4/compiler_warnings.m4 | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 +index abc2da77..f498a282 100644 +--- a/m4/compiler_warnings.m4 ++++ b/m4/compiler_warnings.m4 +@@ -1,11 +1,11 @@ + AC_DEFUN([NM_COMPILER_WARNINGS], + [AC_ARG_ENABLE(more-warnings, +- AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), +- set_more_warnings="$enableval",set_more_warnings=yes) +-AC_MSG_CHECKING(for more warnings, including -Werror) ++ AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), ++ set_more_warnings="$enableval",set_more_warnings=error) ++AC_MSG_CHECKING(for more warnings) + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + AC_MSG_RESULT(yes) +- CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" ++ CFLAGS="-Wall -std=gnu89 $CFLAGS" + + for option in -Wmissing-declarations -Wmissing-prototypes \ + -Wdeclaration-after-statement -Wstrict-prototypes \ +@@ -26,6 +26,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + unset SAVE_CFLAGS + done + unset option ++ if test "x$set_more_warnings" = xerror; then ++ CFLAGS="$CFLAGS -Werror" ++ fi + else + AC_MSG_RESULT(no) + fi +-- +2.17.0 + diff -Nru modemmanager-1.7.990/debian/patches/series modemmanager-1.7.990/debian/patches/series --- modemmanager-1.7.990/debian/patches/series 2018-03-01 15:10:04.000000000 +0100 +++ modemmanager-1.7.990/debian/patches/series 2018-06-06 16:33:53.000000000 +0200 @@ -1 +1,2 @@ default_strict_probing_policy.patch +0001-m4-compiler_warnings.m4-Let-Werror-be-disabled.patch diff -Nru modemmanager-1.7.990/debian/rules modemmanager-1.7.990/debian/rules --- modemmanager-1.7.990/debian/rules 2018-02-25 21:37:42.000000000 +0100 +++ modemmanager-1.7.990/debian/rules 2018-04-24 23:54:35.000000000 +0200 @@ -24,6 +24,7 @@ dh_auto_configure -- \ --enable-gtk-doc \ --with-polkit=strict \ + --enable-more-warnings \ --with-suspend-resume=systemd \ --with-systemdsystemunitdir=/lib/systemd/system