git.iko.soy/unity8
on xenial help sign in
Explicitly select gcc version.
7cf1224thomas-voss
debian/control+5−1
compare with xenial
unifiedsplit
@@ -7,6 +7,10 @@ Build-Depends: cmake,
7 debhelper (>= 9),
7 debhelper (>= 9),
8 doxyqml,
8 doxyqml,
9 graphviz,
9 graphviz,
10+# We rely on C++11 features, and to prevent from ABI breaks
11+# in libstdc++ causing us issues, we explicitly select a G++
12+# version.
13+ g++-4.9,
10 libdee-qt5-dev (>= 3.2),
14 libdee-qt5-dev (>= 3.2),
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
15 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
12 libgl1-mesa-dri,
16 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
15 libgsettings-qt-dev,
19 libgsettings-qt-dev,
16 libhardware-dev,
20 libhardware-dev,
17 libhud-client2-dev,
21 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
19 libpulse-dev,
23 libpulse-dev,
20 libqmenumodel-dev (>= 0.2.8),
24 libqmenumodel-dev (>= 0.2.8),
21 libqt5xmlpatterns5-dev,
25 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
1#!/usr/bin/make -f
1#!/usr/bin/make -f
2# -*- makefile -*-
2# -*- makefile -*-
3
3
4+include /usr/share/dpkg/default.mk
5+
4# Uncomment this to turn on verbose mode.
6# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
7#export DH_VERBOSE=1
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
8export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7export NO_PNG_PKG_MANGLE=1
9export NO_PNG_PKG_MANGLE=1
8
10
11+# Explicitly selecting a G{CC,++}-version here to avoid accidental
12+# ABI breaks introduced by toolchain updates.
13+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
14+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
15+
9%:
16%:
10 dh $@ --parallel --fail-missing --with python2,python3
17 dh $@ --parallel --fail-missing --with python2,python3
11
18
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
14
14
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
16
16
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
19
19
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
24#include <QtGui/QIcon>
24#include <QtGui/QIcon>
25#include <QMultiMap>
25#include <QMultiMap>
26
26
27+#include <functional>
28+#include <random>
29+
27using namespace UserMetricsOutput;
30using namespace UserMetricsOutput;
28
31
29namespace UserMetricsOutput
32namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
24#include <QDebug>
24#include <QDebug>
25#include <unitymenumodel.h>
25#include <unitymenumodel.h>
26
26
27+#include <functional>
28+#include <chrono>
29+
27class UnityMenuModelStackTest : public QObject
30class UnityMenuModelStackTest : public QObject
28{
31{
29 Q_OBJECT
32 Q_OBJECT