Unity

Merge lp:~muktupavels/unity/fix-build into lp:unity

  1. fix-build
  2. Merge into trunk
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: no longer in the source branch.
Merged at revision: 4277
Proposed branch: lp:~muktupavels/unity/fix-build
Merge into: lp:unity
Diff against target: 58 lines (+5/-3)
4 files modified
plugins/unity-mt-grab-handles/CMakeLists.txt (+1/-0)
plugins/unityshell/CMakeLists.txt (+1/-0)
tests/test_icon_loader.cpp (+2/-2)
unity-shared/BamfApplicationManager.cpp (+1/-1)
To merge this branch: bzr merge lp:~muktupavels/unity/fix-build
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+353719@code.launchpad.net

Commit message

Fix build.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unity-mt-grab-handles/CMakeLists.txt'
2--- plugins/unity-mt-grab-handles/CMakeLists.txt 2016-02-09 01:26:22 +0000
3+++ plugins/unity-mt-grab-handles/CMakeLists.txt 2018-08-27 12:37:35 +0000
4@@ -12,6 +12,7 @@
5 set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
6 set (libdir ${CMAKE_INSTALL_LIBDIR})
7 set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
8+set (COMPIZ_PLUGIN_PACK_BUILD 1)
9
10 compiz_plugin (unitymtgrabhandles PKGDEPS nux-4.0>=4.0.0 PLUGINDEPS composite opengl CFLAGSADD -std=c++0x)
11
12
13=== modified file 'plugins/unityshell/CMakeLists.txt'
14--- plugins/unityshell/CMakeLists.txt 2016-02-09 01:26:22 +0000
15+++ plugins/unityshell/CMakeLists.txt 2018-08-27 12:37:35 +0000
16@@ -14,6 +14,7 @@
17 set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
18 set (libdir ${CMAKE_INSTALL_LIBDIR})
19 set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
20+set (COMPIZ_PLUGIN_PACK_BUILD 1)
21
22 compiz_plugin (unityshell
23 PKGDEPS ${UNITY_PLUGIN_DEPS}
24
25=== modified file 'tests/test_icon_loader.cpp'
26--- tests/test_icon_loader.cpp 2017-09-25 15:58:08 +0000
27+++ tests/test_icon_loader.cpp 2018-08-27 12:37:35 +0000
28@@ -118,7 +118,7 @@
29 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
30 }
31
32-TEST_F(TestIconLoader, TestGetAnnotatedIcon)
33+TEST_F(TestIconLoader, UNSTABLE_TEST (TestGetAnnotatedIcon))
34 {
35 LoadResult load_result;
36
37@@ -132,7 +132,7 @@
38 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
39 }
40
41-TEST_F(TestIconLoader, TestGetColorizedIcon)
42+TEST_F(TestIconLoader, UNSTABLE_TEST (TestGetColorizedIcon))
43 {
44 LoadResult load_result;
45
46
47=== modified file 'unity-shared/BamfApplicationManager.cpp'
48--- unity-shared/BamfApplicationManager.cpp 2016-02-25 14:29:34 +0000
49+++ unity-shared/BamfApplicationManager.cpp 2018-08-27 12:37:35 +0000
50@@ -255,7 +255,7 @@
51 }
52
53 Tab::Tab(ApplicationManager const& manager, glib::Object<BamfView> const& tab)
54- : Tab(manager_, glib::object_cast<BamfTab>(tab))
55+ : Tab(manager, glib::object_cast<BamfTab>(tab))
56 {}
57
58 Window Tab::window_id() const