Merge lp:~thomas-voss/unity8/explicit-gcc-version into lp:unity8

[Thomas Voß]

Explicitly select gcc version.

Explicitly select gcc version.

[Jussi Pakkanen (jpakkane)]

This duplication is there again:

export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9

and

dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)

You don't need to give these compiler flags to CMake, it will pick them up automatically from the envvars. In addition this definition is broken because it does not quote its arguments. So if, for example, in the future CC is set to "ccache gcc-whatever", this will break.

[lp:~thomas-voss/unity8/explicit-gcc-version]

1069. By Thomas Voß on 2014-07-23

Account for pay-1 to pay-2.

1070. By Thomas Voß on 2014-07-23

Add missing includes.

1071. By Thomas Voß on 2014-07-23

Add missing includes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/unity8-ci/3549/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2370/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/551/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3590/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1071
http://jenkins.qa.ubuntu.com/job/unity8-ci/3551/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/553/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3596/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/unity8/explicit-gcc-version]

1072. By Thomas Voß on 2014-07-23

Remove adjustments to cmake invocation.

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Unrelated fails.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1072
http://jenkins.qa.ubuntu.com/job/unity8-ci/3557/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/559/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3608/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-17 09:37:51 +0000
+++ debian/control	2014-07-23 15:31:05 +0000
@@ -7,6 +7,10 @@
                debhelper (>= 9),
                doxyqml,
                graphviz,
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
+               g++-4.9,
                libdee-qt5-dev (>= 3.2),
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
@@ -15,7 +19,7 @@
                libgsettings-qt-dev,
                libhardware-dev,
                libhud-client2-dev,
-               libpay1-dev,
+               libpay2-dev,
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,

=== modified file 'debian/rules'
--- debian/rules	2014-06-11 15:36:51 +0000
+++ debian/rules	2014-07-23 15:31:05 +0000
@@ -1,11 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/default.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export NO_PNG_PKG_MANGLE=1
 
+# 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 $@ --parallel --fail-missing --with python2,python3
 

=== modified file 'plugins/Ubuntu/Payments/CMakeLists.txt'
--- plugins/Ubuntu/Payments/CMakeLists.txt	2014-06-30 14:47:07 +0000
+++ plugins/Ubuntu/Payments/CMakeLists.txt	2014-07-23 15:31:05 +0000
@@ -14,7 +14,7 @@
 
 add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
 
-pkg_check_modules(LIBPAY REQUIRED pay-1)
+pkg_check_modules(LIBPAY REQUIRED pay-2)
 add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
 
 target_link_libraries(Payments ${LIBPAY_LDFLAGS})

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2014-06-12 15:03:20 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2014-07-23 15:31:05 +0000
@@ -24,6 +24,9 @@
 #include <QtGui/QIcon>
 #include <QMultiMap>
 
+#include <functional>
+#include <random>
+
 using namespace UserMetricsOutput;
 
 namespace UserMetricsOutput

=== modified file 'tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp'
--- tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp	2014-06-12 15:03:20 +0000
+++ tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp	2014-07-23 15:31:05 +0000
@@ -24,6 +24,9 @@
 #include <QDebug>
 #include <unitymenumodel.h>
 
+#include <functional>
+#include <chrono>
+
 class UnityMenuModelStackTest : public QObject
 {
     Q_OBJECT