I have made the following changes intended for : CE:UX:MTF / meegotouch-compositor
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7330 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7330: Messages from BOSS: State: review at 2012-11-07T14:45:04 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor changes files: -------------- --- meegotouch-compositor.changes +++ meegotouch-compositor.changes @@ -0,0 +1,5 @@ +* Mon Nov 05 2012 Pekka Lundstrom <[email protected]> - 1.1.31-1 +- Add patch 0012-systemd-ready-signal.patch + This signals systemd when initialization is done + Fixes: NEMO#558 + new: ---- 0012-systemd-ready-signal.patch spec files: ----------- --- meegotouch-compositor.spec +++ meegotouch-compositor.spec @@ -31,6 +31,7 @@ Patch9: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch Patch10: 0001-sort-lockscreens-before-checking-desktops.patch Patch11: 0001-remove-lockscreen_painted-waiting-logic.patch +Patch12: 0012-systemd-ready-signal.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtDBus) @@ -50,6 +51,7 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(mce) +BuildRequires: pkgconfig(systemd) BuildRequires: test-definition BuildRequires: doxygen Provides: duicompositor >= 0.3.9 @@ -109,6 +111,8 @@ %patch10 -p1 # 0001-remove-lockscreen_painted-waiting-logic.patch %patch11 -p1 +# 0012-systemd-ready-signal.patch +%patch12 -p1 # >> setup # << setup other changes: -------------- ++++++ 0012-systemd-ready-signal.patch (new) --- 0012-systemd-ready-signal.patch +++ 0012-systemd-ready-signal.patch @@ -0,0 +1,35 @@ +diff --git a/mcompositor/main.cpp b/mcompositor/main.cpp +index 73a3985..451c71a 100644 +--- a/mcompositor/main.cpp ++++ b/mcompositor/main.cpp +@@ -21,6 +21,7 @@ + #include <QGLWidget> + #include "mcompositescene.h" + #include "mcompositemanager.h" ++#include <systemd/sd-daemon.h> + + // @plugindir ? + #define PLUGINDIR "/usr/lib/mcompositor" +@@ -101,5 +102,8 @@ int main(int argc, char *argv[]) + app.prepareEvents(); + app.redirectWindows(); + view.show(); ++ if (app.arguments().indexOf("-systemd") >= 0) { ++ sd_notify(0, "READY=1"); ++ } + return app.exec(); + } +diff --git a/mcompositor/mcompositor.pro b/mcompositor/mcompositor.pro +index 634d294..6b84bc9 100644 +--- a/mcompositor/mcompositor.pro ++++ b/mcompositor/mcompositor.pro +@@ -5,6 +5,9 @@ INCLUDEPATH += ../src + + LIBS += ../src/libmcompositor.so ../decorators/libdecorator/libdecorator.so + ++CONFIG += link_pkgconfig ++PKGCONFIG += libsystemd-daemon ++ + target.path += $$M_INSTALL_BIN + INSTALLS += target + ++++++ mcompositor.service --- mcompositor.service +++ mcompositor.service @@ -4,9 +4,9 @@ Requires=dbus.socket xorg.target [Service] -ExecStart=/usr/bin/mcompositor +Type=notify +ExecStart=/usr/bin/mcompositor -systemd Restart=always [Install] WantedBy=nemo-middleware.target - ++++++ meegotouch-compositor.yaml --- meegotouch-compositor.yaml +++ meegotouch-compositor.yaml @@ -24,6 +24,7 @@ - meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch - 0001-sort-lockscreens-before-checking-desktops.patch - 0001-remove-lockscreen_painted-waiting-logic.patch + - 0012-systemd-ready-signal.patch Description: | This package contains the Direct UI compositing window manager. PkgConfigBR: @@ -44,6 +45,7 @@ - xrandr - xi - mce + - systemd PkgBR: - test-definition - doxygen
