liri-shell: update sources - fix build
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,36 +0,0 @@
|
||||
From 396f499db585e0be7029224ec6855b7f554d786f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 24 Apr 2015 13:29:02 +0200
|
||||
Subject: [PATCH] find host's git
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
we don't build git-native
|
||||
|
||||
Upstream-Status: Inappropriate [oe-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
cmake/GetGitRevision.cmake | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/GetGitRevision.cmake b/cmake/GetGitRevision.cmake
|
||||
index 692b6c4..c2ff81e 100644
|
||||
--- a/cmake/GetGitRevision.cmake
|
||||
+++ b/cmake/GetGitRevision.cmake
|
||||
@@ -33,7 +33,10 @@
|
||||
function(create_git_head_revision_file _file _target)
|
||||
if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
|
||||
if(NOT GIT_FOUND)
|
||||
- find_package(Git QUIET)
|
||||
+ execute_process(COMMAND which git
|
||||
+ OUTPUT_VARIABLE GIT_EXECUTABLE
|
||||
+ ERROR_QUIET
|
||||
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
endif()
|
||||
|
||||
add_custom_target(gitsha1-${_target}
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From b0b124b194fbb614778f64b56c1a8b95aa4bd898 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 9 Feb 2017 22:50:28 +0100
|
||||
Subject: [PATCH] remove -Werror from build flags
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
workaround build for Raspi2/CortexA7 (hope I get all types)
|
||||
|
||||
| /usr/include/qt5/QtCore/qlist.h:495:34: error: cast from 'QList<QVariant>::Node*' to 'QVariant*' increases required alignment of target type [-Werror=cast-align]
|
||||
|
||||
| /usr/include/qt5/QtCore/qhash.h:235:16: error: cast from 'QHashData::Node*' to 'QHash<QString, QVariant>::Node* {aka QHashNode<QString, QVariant>*}' increases required alignment of target type [-Werror=cast-align]
|
||||
|
||||
| /usr/include/qt5/QtCore/qobject_impl.h:163:13: error: switch missing default case [-Werror=switch-default]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b8ba5b8..e2b19ea 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -54,7 +54,7 @@ endif()
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
|
||||
|
||||
# Build flags
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11")
|
||||
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11")
|
||||
|
||||
# qCDebug() uses zero variadic arguments, so we need to disable this warning
|
||||
# as it would become an error with -Werror
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -1,56 +1,43 @@
|
||||
SUMMARY = "Responsive shell for Liri OS"
|
||||
LICENSE = "GPLv3"
|
||||
LICENSE = "LGPLv3 & GPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
inherit liri systemd pythonnative distro_features_check
|
||||
inherit liri pythonnative distro_features_check gsettings
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "wayland pam"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-find-host-s-git.patch \
|
||||
file://0002-remove-Werror-from-build-flags.patch \
|
||||
"
|
||||
PV = "0.9.0+git${SRCPV}"
|
||||
SRCREV = "9f5ed08fe14820e6f5e03b91410dd280f3678430"
|
||||
SRCREV = "192e67c93c9acc871539b4e01d4d7c32111f7e93"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS += " \
|
||||
qtwayland-native \
|
||||
qtaccountsservice \
|
||||
libpam \
|
||||
vibe \
|
||||
liri-wayland \
|
||||
liri-workspace \
|
||||
qtwayland \
|
||||
qtquickcontrols2 \
|
||||
liri-qtaccountsservice \
|
||||
liri-qtgsettings \
|
||||
liri-eglfs \
|
||||
solid \
|
||||
polkit-qt-1 \
|
||||
pipewire \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \
|
||||
-DINSTALL_SYSCONFDIR=${sysconfdir} \
|
||||
"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "liri.service"
|
||||
|
||||
# for starter scripts
|
||||
# for starter scripts (still necessary?)
|
||||
RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
|
||||
|
||||
# REVISIT optionals
|
||||
RRECOMMENDS_${PN} += " \
|
||||
liri-wallpapers \
|
||||
paper-icon-theme \
|
||||
qtvirtualkeyboard-qmlplugins \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir} \
|
||||
${systemd_unitdir} \
|
||||
${OE_QMAKE_PATH_QML}/Liri \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
${OE_QMAKE_PATH_QML}/Liri/*/.debug \
|
||||
${systemd_user_unitdir} \
|
||||
${datadir}/wayland-sessions \
|
||||
${datadir}/desktop-directories \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
|
||||
RREPLACES_${PN} = "hawaii-shell"
|
||||
|
||||
Reference in New Issue
Block a user