From bdeda99e6dd7b26f607294eb0cf2b6b53f1f13f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 2 Dec 2018 20:28:15 +0100
Subject: [PATCH] liri-qtaccountsservice: upgrade to 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../liri-qtaccountsservice_git.bb             | 13 ++++++++
 .../0001-remove-Werror-from-build-flags.patch | 33 -------------------
 .../qtaccountsservice_git.bb                  | 18 ----------
 3 files changed, 13 insertions(+), 51 deletions(-)
 create mode 100644 recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb
 delete mode 100644 recipes-liri/qtaccountsservice/files/0001-remove-Werror-from-build-flags.patch
 delete mode 100644 recipes-liri/qtaccountsservice/qtaccountsservice_git.bb

diff --git a/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb b/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb
new file mode 100644
index 00000000..0393366c
--- /dev/null
+++ b/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit liri
+
+PV = "1.2.0+git${SRCPV}"
+SRCREV = "a92567854891555226501ba200bf4faabc16c4c9"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${OE_QMAKE_PATH_QML}"
diff --git a/recipes-liri/qtaccountsservice/files/0001-remove-Werror-from-build-flags.patch b/recipes-liri/qtaccountsservice/files/0001-remove-Werror-from-build-flags.patch
deleted file mode 100644
index 4f9f17da..00000000
--- a/recipes-liri/qtaccountsservice/files/0001-remove-Werror-from-build-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2ebd5aab506a61f754d2f3de627079792d213454 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 9 Feb 2017 21:14:04 +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
-
-| /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]
-
-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 2c5fdc1..89c7671 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
-
diff --git a/recipes-liri/qtaccountsservice/qtaccountsservice_git.bb b/recipes-liri/qtaccountsservice/qtaccountsservice_git.bb
deleted file mode 100644
index 3571830c..00000000
--- a/recipes-liri/qtaccountsservice/qtaccountsservice_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-"
-
-inherit liri
-
-SRC_URI += "file://0001-remove-Werror-from-build-flags.patch"
-PV = "0.7.0+git${SRCPV}"
-SRCREV = "b1440d98c272cc1890378f44baa4631a8afb40db"
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
-FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"
-
-CMAKE_ALIGN_SYSROOT[1] = "QtAccountsService, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
-CMAKE_ALIGN_SYSROOT[2] = "QtAccountsService, -S${libdir}/lib, -s${OE_QMAKE_PATH_HOST_LIBS}/lib"