zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

liri-terminal: upgrade to 0.2.0+

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-12-10 19:15:11 +01:00
parent 0d16bb834b
commit 39f67d293b
2 changed files with 13 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
recipes-liri/liri-terminal/files/0001-remove-Werror-from-build-flags.patch
View File

@@ -1,39 +0,0 @@
From 8030b37301f63ff5afdc659c48a2f6490da68af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 9 Feb 2017 22:32:15 +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]
| liri-terminal/0.0.0+gitAUTOINC+1b428ebf54-r0/git/lib/CharacterColor.h:259:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
| liri-terminal/0.0.0+gitAUTOINC+1b428ebf54-r0/git/lib/CharacterColor.h:273:10: 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 eeb1597..545fb0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ include(KDECompilerSettings)
include(KDECMakeSettings)
# 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

30
recipes-liri/liri-terminal/liri-terminal_git.bb
View File

@@ -1,29 +1,25 @@
SUMMARY = "Terminal emulator"
SUMMARY = "A Material Design terminal"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = " \
file://LICENSE.GPLv3;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
"
inherit liri gsettings
SRC_URI += "file://0001-remove-Werror-from-build-flags.patch"
PV = "0.0.0+git${SRCPV}"
SRCREV = "62acaf9f943e1cdf1b57c87eb8ca2abd1d24a75d"
DEPENDS += " \
liri-fluid \
liri-qtgsettings \
"
PV = "0.2.0+git${SRCPV}"
SRCREV = "15759fc592457d8b26a271491bf45db43825f52f"
S = "${WORKDIR}/git"
DEPENDS += " \
vibe \
"
FILES_${PN} += " \
${datadir}/glib-2.0/schemas \
${datadir}/appdata \
${datadir}/applications \
${OE_QMAKE_PATH_QML}/Liri/Terminal \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_QML}/Liri/*/.debug \
${datadir}/metainfo \
${datadir}/${PN}/color-schemes \
${datadir}/${PN}/kb-layouts \
${OE_QMAKE_PATH_QML} \
"
RREPLACES_${PN} = "hawaii-terminal"