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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3abf80..76ff07f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
1project (unity)1project (unity)
2cmake_minimum_required(VERSION 2.8.9)2cmake_minimum_required(VERSION 3.17.0)
33
4include (cmake/Documentation.cmake)4include (cmake/Documentation.cmake)
5include (cmake/pch.cmake)5include (cmake/pch.cmake)
diff --git a/debian/control b/debian/control
index cd3a3bf..59eabf9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: unity
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: cmake,5Build-Depends: cmake (>= 3.17.0),
6 compiz-dev (>= 1:0.9.13.1+18.04.20180221),6 compiz-dev (>= 1:0.9.13.1+18.04.20180221),
7 debhelper (>= 9.0.0~),7 debhelper (>= 9.0.0~),
8 dbus-test-runner,8 dbus-test-runner,
diff --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
index fb78bd9..a953318 100644
--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
@@ -19,6 +19,8 @@
19#include "unity-mt-grab-handles.h"19#include "unity-mt-grab-handles.h"
20#include <iostream>20#include <iostream>
2121
22using namespace boost::placeholders;
23
22COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable);24COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable);
2325
24unsigned int unity::MT::MaximizedHorzMask = CompWindowStateMaximizedHorzMask;26unsigned int unity::MT::MaximizedHorzMask = CompWindowStateMaximizedHorzMask;

Subscribers

People subscribed via source and target branches