summaryrefslogtreecommitdiff
diff options
authorIain Lane <iain@orangesquash.org.uk>2019-09-03 00:28:30 +0530
committerKhurshid Alam <khurshid.alam@linuxmail.org>2019-09-03 00:28:30 +0530
commit41cb528fc394a9d29e84f745dccc872b22077512 (patch)
tree5e8b27e334e389a5c6fa2cc08dd7418a11ff8ac6
parente1fec42e13a644a19d32621cbafedbbd8db22b5b (diff)
* Disable Werror. It doesn't make sense to fail on compiler warnings for the distro.
* Rebuild against libgnome-desktop-3-18
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog8
-rw-r--r--services/CMakeLists.txt2
3 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03bbea326..249b8fccd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ if (BOOT_LOGGER)
SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
endif (BOOT_LOGGER)
-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
+SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
diff --git a/debian/changelog b/debian/changelog
index f6eb3270a..ebeef1fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+unity (7.5.0+19.04.20190827-0ubuntu1) eoan; urgency=medium
+
+ * Disable Werror. It doesn't make sense to fail on compiler warnings for the
+ distro.
+ * Rebuild against libgnome-desktop-3-18
+
+ -- Iain Lane <iain@orangesquash.org.uk> Tue, 27 Aug 2019 11:10:00 +0100
+
unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium
[ disco/unity: Failed to merge https://git.launchpad.net/unity. ]
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index fe5dff1f8..2829cd269 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -34,7 +34,7 @@ set(PANEL_SOURCES
set(CFLAGS
${SERVICE_DEPS_CFLAGS}
${SERVICE_DEPS_CFLAGS_OTHER}
- "-Werror -Wall -Wno-error=deprecated-declarations"
+ "-Wall -Wno-error=deprecated-declarations"
)
string (REPLACE ";" " " CFLAGS "${CFLAGS}")