git.iko.soy/unity8
on xenial help sign in
Explicitly select gcc version.
commit7cf12246f24e295e853e2b46a5763f600a7a5f74 authorthomas-voss <thomas.voss@canonical.com> dateWed 23 Jul 2014, 15:32 (12 years ago) parenta742b532e54823
5 files changed+19−2
compare with xenial
unifiedsplit
debian/control+5−1 debian/rules+7 plugins/Ubuntu/Payments/CMakeLists.txt+1−1 tests/mocks/libusermetrics/UserMetrics.cpp+3 tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
debian/control+5−1
@@ -7,6 +7,10 @@ Build-Depends: cmake,
77 debhelper (>= 9),
88 doxyqml,
99 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,
1014 libdee-qt5-dev (>= 3.2),
1115 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1216 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
1519 libgsettings-qt-dev,
1620 libhardware-dev,
1721 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
1923 libpulse-dev,
2024 libqmenumodel-dev (>= 0.2.8),
2125 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
11#!/usr/bin/make -f
22# -*- makefile -*-
33
4+include /usr/share/dpkg/default.mk
5+
46# Uncomment this to turn on verbose mode.
57#export DH_VERBOSE=1
68export DPKG_GENSYMBOLS_CHECK_LEVEL=4
79export NO_PNG_PKG_MANGLE=1
810
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+
916%:
1017 dh $@ --parallel --fail-missing --with python2,python3
1118
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
1414
1515add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
1616
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
1818add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
1919
2020target_link_libraries(Payments ${LIBPAY_LDFLAGS})
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
2424#include <QtGui/QIcon>
2525#include <QMultiMap>
2626
27+#include <functional>
28+#include <random>
29+
2730using namespace UserMetricsOutput;
2831
2932namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
2424#include <QDebug>
2525#include <unitymenumodel.h>
2626
27+#include <functional>
28+#include <chrono>
29+
2730class UnityMenuModelStackTest : public QObject
2831{
2932 Q_OBJECT