Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meta-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
meta-nemo
Commits
aae98390
Commit
aae98390
authored
Sep 16, 2016
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lipstick: fix build with --no-accessibility
parent
2d5e5d83
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
4 deletions
+67
-4
0003-Fix-build-with-no-accessibility.patch
...stick/lipstick/0003-Fix-build-with-no-accessibility.patch
+63
-0
lipstick_git.bb
recipes-nemomobile/lipstick/lipstick_git.bb
+4
-4
No files found.
recipes-nemomobile/lipstick/lipstick/0003-Fix-build-with-no-accessibility.patch
0 → 100644
View file @
aae98390
From 3388c954e7fe9a7fbc7e11817e55e208ac3a8e5a Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Mon, 12 Sep 2016 22:48:08 +0200
Subject: [PATCH] Fix build with no-accessibility
---
src/compositor/hwcimage.cpp | 1 +
src/compositor/lipstickrecorder.cpp | 1 +
src/compositor/windowmodel.cpp | 1 +
src/homewindow.cpp | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/compositor/hwcimage.cpp b/src/compositor/hwcimage.cpp
index 25ee330..cbbccb7 100644
--- a/src/compositor/hwcimage.cpp
+++ b/src/compositor/hwcimage.cpp
@@ -18,6 +18,7 @@
#include <QRunnable>
#include <QThreadPool>
+#include <QCoreApplication>
#include <QQuickWindow>
#include <QSGSimpleTextureNode>
diff --git a/src/compositor/lipstickrecorder.cpp b/src/compositor/lipstickrecorder.cpp
index a758363..5e94686 100644
--- a/src/compositor/lipstickrecorder.cpp
+++ b/src/compositor/lipstickrecorder.cpp
@@ -16,6 +16,7 @@
#include <sys/time.h>
#include <grp.h>
+#include <QCoreApplication>
#include <QMutexLocker>
#include "lipstickrecorder.h"
diff --git a/src/compositor/windowmodel.cpp b/src/compositor/windowmodel.cpp
index 7ecd4d4..102fc45 100644
--- a/src/compositor/windowmodel.cpp
+++ b/src/compositor/windowmodel.cpp
@@ -14,6 +14,7 @@
****************************************************************************/
#include <QDBusConnection>
+#include <QDebug>
#include "lipstickcompositorwindow.h"
#include "lipstickcompositor.h"
#include "windowmodel.h"
diff --git a/src/homewindow.cpp b/src/homewindow.cpp
index b59e668..2d33bbd 100644
--- a/src/homewindow.cpp
+++ b/src/homewindow.cpp
@@ -20,6 +20,7 @@
#include <QQuickView>
#include <QQmlContext>
#include <QGuiApplication>
+#include <QDebug>
#include "homeapplication.h"
#include "compositor/lipstickcompositorprocwindow.h"
#include "compositor/lipstickcompositor.h"
--
2.9.3
recipes-nemomobile/lipstick/lipstick_git.bb
View file @
aae98390
...
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24"
...
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24"
SRC_URI = "git://git.merproject.org/mer-core/lipstick.git;protocol=https \
SRC_URI = "git://git.merproject.org/mer-core/lipstick.git;protocol=https \
file://0001-Disables-tests-tools-and-doc-and-fixes-build.patch \
file://0001-Disables-tests-tools-and-doc-and-fixes-build.patch \
file://0002-Store-notifications-database-inside-cere-s-home-dire.patch"
file://0002-Store-notifications-database-inside-cere-s-home-dire.patch \
file://0003-Fix-build-with-no-accessibility.patch"
SRCREV = "d393a948d2d7d179dbe5dedf3ae68543e655507a"
SRCREV = "d393a948d2d7d179dbe5dedf3ae68543e655507a"
PR = "r1"
PR = "r1"
PV = "+git${SRCREV}"
PV = "+git${SRCREV}"
...
@@ -13,9 +14,8 @@ S = "${WORKDIR}/git"
...
@@ -13,9 +14,8 @@ S = "${WORKDIR}/git"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS += "qtbase qtsensors qtdeclarative qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qt5-qpa-hwcomposer-plugin qmsystem nemo-keepalive qttools-native"
DEPENDS += "qtbase qtsensors qtdeclarative qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qmsystem nemo-keepalive qttools-native"
RDEPENDS_${PN} += "qt5-qpa-hwcomposer-plugin ${PN}-locale"
RDEPENDS_${PN} += "${PN}-locale"
# qt5-qpa-hwcomposer-plugin isn't detected to be needed at runtime by OpenEmbedded
inherit qmake5
inherit qmake5
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment