diff -u qtmir-0.5.1+17.04.20170404/debian/changelog qtmir-0.5.1+17.04.20170404/debian/changelog --- qtmir-0.5.1+17.04.20170404/debian/changelog +++ qtmir-0.5.1+17.04.20170404/debian/changelog @@ -1,3 +1,10 @@ +qtmir (0.5.1+17.04.20170404-0ubuntu3) artful; urgency=medium + + * Drop cgmanager dependencies, no longer useful as uap moved onto + systemd. + + -- Dimitri John Ledkov Mon, 24 Apr 2017 14:59:25 +0100 + qtmir (0.5.1+17.04.20170404-0ubuntu2) zesty; urgency=medium * No-change rebuild (LP: #1681870). diff -u qtmir-0.5.1+17.04.20170404/debian/control qtmir-0.5.1+17.04.20170404/debian/control --- qtmir-0.5.1+17.04.20170404/debian/control +++ qtmir-0.5.1+17.04.20170404/debian/control @@ -6,7 +6,6 @@ cmake-extras (>= 0.10), debhelper (>= 9), google-mock (>= 1.6.0+svn437), - libcgmanager-dev, libcontent-hub-dev (>= 0.2), libfontconfig1-dev, libgles2-mesa-dev, only in patch2: unchanged: --- qtmir-0.5.1+17.04.20170404.orig/CMakeLists.txt +++ qtmir-0.5.1+17.04.20170404/CMakeLists.txt @@ -91,7 +91,6 @@ pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED) pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED) pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27) -pkg_check_modules(CGMANAGER libcgmanager REQUIRED) pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED) pkg_check_modules(VALGRIND valgrind REQUIRED) only in patch2: unchanged: --- qtmir-0.5.1+17.04.20170404.orig/src/modules/Unity/Application/CMakeLists.txt +++ qtmir-0.5.1+17.04.20170404/src/modules/Unity/Application/CMakeLists.txt @@ -14,7 +14,6 @@ ${UBUNTU_PLATFORM_API_INCLUDE_DIRS} ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS} ${GSETTINGS_QT_INCLUDE_DIRS} - ${CGMANAGER_INCLUDE_DIRS} ${LTTNG_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} @@ -30,7 +29,6 @@ set(QMLMIRPLUGIN_SRC application_manager.cpp application.cpp - cgmanager.cpp ../../../common/abstractdbusservicemonitor.cpp ../../../common/debughelpers.cpp dbusfocusinfo.cpp only in patch2: unchanged: --- qtmir-0.5.1+17.04.20170404.orig/src/modules/Unity/Application/dbusfocusinfo.cpp +++ qtmir-0.5.1+17.04.20170404/src/modules/Unity/Application/dbusfocusinfo.cpp @@ -17,7 +17,6 @@ #include "dbusfocusinfo.h" // local -#include "cgmanager.h" #include "mirsurfacelistmodel.h" #include "mirsurfaceinterface.h" #include "session_interface.h" @@ -35,8 +34,6 @@ { QDBusConnection::sessionBus().registerService("com.canonical.Unity.FocusInfo"); QDBusConnection::sessionBus().registerObject("/com/canonical/Unity/FocusInfo", this, QDBusConnection::ExportScriptableSlots); - - m_cgManager = new CGManager(this); } bool DBusFocusInfo::isPidFocused(unsigned int pid) @@ -54,22 +51,8 @@ QSet DBusFocusInfo::fetchAssociatedPids(pid_t pid) { - QString cgroup = m_cgManager->getCGroupOfPid("freezer", pid); - - // If a cgroup has a format like this: - // /user.slice/user-32011.slice/session-c3.scope/upstart/application-legacy-puritine_gedit_0.0- - // All PIds in it are associated with a single application. - if (cgroup.split("/").contains("upstart")) { - QSet pidSet = m_cgManager->getTasks("freezer", cgroup); - qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "along with:" << pidSet; - if (pidSet.isEmpty()) { - pidSet << pid; - } - return pidSet; - } else { - qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "which is not app-specific"; - return QSet({pid}); - } + qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "unable to determine cgroup, assuming is not app-specific. TODO port me to systemd ubuntu-app-launch"; + return QSet({pid}); } SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet &pidSet) only in patch2: unchanged: --- qtmir-0.5.1+17.04.20170404.orig/src/modules/Unity/Application/dbusfocusinfo.h +++ qtmir-0.5.1+17.04.20170404/src/modules/Unity/Application/dbusfocusinfo.h @@ -21,7 +21,6 @@ namespace qtmir { -class CGManager; class MirSurfaceInterface; /* @@ -57,8 +56,6 @@ MirSurfaceInterface *findQmlSurface(const QString &serializedId); const QList &m_applications; - - CGManager *m_cgManager; }; } // namespace qtmir