From c317df9b92f1574da2ea3b092d9a1ac150662888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 2 Dec 2018 22:46:28 +0100 Subject: [PATCH] liri-workspace: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../0001-remove-Werror-from-build-flags.patch | 37 ------------------- .../liri-workspace/liri-workspace_git.bb | 35 ------------------ 2 files changed, 72 deletions(-) delete mode 100644 recipes-liri/liri-workspace/files/0001-remove-Werror-from-build-flags.patch delete mode 100644 recipes-liri/liri-workspace/liri-workspace_git.bb diff --git a/recipes-liri/liri-workspace/files/0001-remove-Werror-from-build-flags.patch b/recipes-liri/liri-workspace/files/0001-remove-Werror-from-build-flags.patch deleted file mode 100644 index f246b987..00000000 --- a/recipes-liri/liri-workspace/files/0001-remove-Werror-from-build-flags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From da9edbb743288a82e54dff59b36ff92a615e6861 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 9 Feb 2017 22:44:35 +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::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::Node* {aka QHashNode*}' 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 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ddb3c80..2479c12 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb]") - endif() - - # 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") - - # Don't cast QString from/to ascii - add_definitions( --- -2.9.3 - diff --git a/recipes-liri/liri-workspace/liri-workspace_git.bb b/recipes-liri/liri-workspace/liri-workspace_git.bb deleted file mode 100644 index 2ffe712d..00000000 --- a/recipes-liri/liri-workspace/liri-workspace_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Workspace, programs and plugins for Liri OS" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ -" - -inherit liri gsettings - -SRC_URI += "file://0001-remove-Werror-from-build-flags.patch" -PV = "0.9.0+git${SRCPV}" -SRCREV = "f9955fbbd05254fa0e8fe9e6f1d1771bb75c673c" -S = "${WORKDIR}/git" - -DEPENDS += " \ - liri-wayland \ - vibe \ - paper-icon-theme \ - qt-gstreamer \ - dconf \ -" - -EXTRA_OECMAKE += " \ - -DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \ -" - -FILES_${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/desktop-directories \ - ${datadir}/liri-workspace/translations/*.qm \ - ${OE_QMAKE_PATH_PLUGINS} \ -" - -RREPLACES_${PN} = "hawaii-baseapps hawaii-workspace" -RPROVIDES_${PN} = "hawaii-baseapps hawaii-workspace" -RCONFLICTS_${PN} = "hawaii-baseapps hawaii-workspace"