Merge lp:~alecu/unity-scope-click/explicit-gcc-version-trunk into lp:unity-scope-click

[Alejandro J. Cura]

Explicitly select g++ version 4.9 for ABI stability

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/477/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/477/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/explicit-gcc-version-trunk]

238. By Alejandro J. Cura on 2014-06-27

Fix errors compiling with 4.9

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/478/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/486/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1403/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/26/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1166/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1570/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/486/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-06-23 15:00:28 +0000
+++ debian/control	2014-06-27 17:45:27 +0000
@@ -1,9 +1,12 @@
 Source: unity-scope-click
 Section: x11
 Priority: optional
+# g++-4.9: since we use c++11 features, explicitly select a g++ version
+#          to protect from ABI breaks in libstdc++
 Build-Depends: cmake (>= 2.8.10),
                debhelper (>= 9),
                dh-translations,
+               g++-4.9,
                google-mock,
                intltool,
                libboost-locale-dev,

=== modified file 'debian/rules'
--- debian/rules	2014-04-04 16:40:49 +0000
+++ debian/rules	2014-06-27 17:45:27 +0000
@@ -1,4 +1,10 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
 DH_CMAKE_BUILD_DIR=obj-${DEB_BUILD_GNU_TYPE}
 

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-06-16 15:38:49 +0000
+++ libclickscope/click/interface.cpp	2014-06-27 17:45:27 +0000
@@ -435,11 +435,11 @@
                 callback(package_names, InterfaceError::NoError);
             } catch (...) {
                 qWarning() << "Can't parse 'click list' output: " << QString::fromStdString(stdout_data);
-                callback({}, InterfaceError::ParseError);
+                callback(PackageSet(), InterfaceError::ParseError);
             }
         } else {
             qWarning() << "Error" << code << "running 'click list': " << QString::fromStdString(stderr_data);
-            callback({}, InterfaceError::CallError);
+            callback(PackageSet(), InterfaceError::CallError);
         }
     });
 }