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

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: ce828994efb7ca9aac22111003d5bc4056bea168
Merged at revision: d0f050b7e152b20e693e5461ebadbbfcb2e21ae6
Proposed branch: ~muktupavels/unity:fix-build
Merge into: unity:master
Diff against target: 37 lines (+4/-2)
3 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+2/-0)
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+428524@code.launchpad.net

Commit message

Fix build after Compiz changes

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index e3abf80..76ff07f 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -1,5 +1,5 @@
6 project (unity)
7-cmake_minimum_required(VERSION 2.8.9)
8+cmake_minimum_required(VERSION 3.17.0)
9
10 include (cmake/Documentation.cmake)
11 include (cmake/pch.cmake)
12diff --git a/debian/control b/debian/control
13index cd3a3bf..59eabf9 100644
14--- a/debian/control
15+++ b/debian/control
16@@ -2,7 +2,7 @@ Source: unity
17 Section: gnome
18 Priority: optional
19 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
20-Build-Depends: cmake,
21+Build-Depends: cmake (>= 3.17.0),
22 compiz-dev (>= 1:0.9.13.1+18.04.20180221),
23 debhelper (>= 9.0.0~),
24 dbus-test-runner,
25diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
26index fb78bd9..a953318 100644
27--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
28+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
29@@ -19,6 +19,8 @@
30 #include "unity-mt-grab-handles.h"
31 #include <iostream>
32
33+using namespace boost::placeholders;
34+
35 COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable);
36
37 unsigned int unity::MT::MaximizedHorzMask = CompWindowStateMaximizedHorzMask;

Subscribers

People subscribed via source and target branches