Merge lp:mir/0.7 into lp:mir/ubuntu

[Alexandros Frantzis]

Mir 0.7.2 release Fixes: 1366134

Mir 0.7.2 release Fixes: 1366134

[Daniel van Vugt (vanvugt)]

Oh the third chunk of the fix applied to devel doesn't exist in 0.7. Seems to be true...

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1903
http://jenkins.qa.ubuntu.com/job/mir-ci/1690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1756
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/28/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/28/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/28/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1690/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Failure is caused by CI infrastructure, not related to code or packaging changes:

"java.io.IOException: /var/lib/jenkins/workspace/mir-utopic-amd64-ci/work/results/coverage.xml is not an XML file, please check your report pattern"

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-09 16:30:37 +0000
+++ CMakeLists.txt	2014-09-12 08:26:02 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 7) # This should change at least with every MIRSERVER_ABI
-set(MIR_VERSION_PATCH 1)
+set(MIR_VERSION_PATCH 2)
 
 set(MIR_VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH})
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-09 18:28:01 +0000
+++ debian/changelog	2014-09-12 08:26:02 +0000
@@ -1,3 +1,11 @@
+mir (0.7.2) UNRELEASED; urgency=medium
+
+  * New upstream release 0.7.2 (https://launchpad.net/mir/+milestone/0.7.2)
+    - Bug fixes
+      . Restore support for gcc-4.8/trusty (LP: #1366134)
+
+ -- Alexandros Frantzis <[e-mail]>  Fri, 12 Sep 2014 11:11:17 +0300
+
 mir (0.7.1+14.10.20140909.1-0ubuntu1) utopic; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-08-29 16:00:17 +0000
+++ src/client/default_connection_configuration.cpp	2014-09-12 08:26:02 +0000
@@ -54,7 +54,10 @@
 {
     Dl_info info;
 
-    dladdr(reinterpret_cast<void*>(&ensure_loaded_with_rtld_global), &info);
+    // Cast dladdr itself to work around g++-4.8 warnings (LP: #1366134)
+    typedef int (safe_dladdr_t)(void(*func)(), Dl_info *info);
+    safe_dladdr_t *safe_dladdr = (safe_dladdr_t*)&dladdr;
+    safe_dladdr(&ensure_loaded_with_rtld_global, &info);
     dlopen(info.dli_fname,  RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);
 }
 }

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2014-08-29 16:00:17 +0000
+++ src/platform/options/default_configuration.cpp	2014-09-12 08:26:02 +0000
@@ -74,7 +74,10 @@
 {
     Dl_info info;
 
-    dladdr(reinterpret_cast<void*>(&ensure_loaded_with_rtld_global), &info);
+    // Cast dladdr itself to work around g++-4.8 warnings (LP: #1366134)
+    typedef int (safe_dladdr_t)(void(*func)(), Dl_info *info);
+    safe_dladdr_t *safe_dladdr = (safe_dladdr_t*)&dladdr;
+    safe_dladdr(&ensure_loaded_with_rtld_global, &info);
     dlopen(info.dli_fname,  RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);
 }
 }