From a45be5cea929f09e973838b6959f1aac0de1f1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 2 Dec 2018 20:15:25 +0100
Subject: [PATCH] liri-fluid: upgrade to 1.1.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>
---
 recipes-liri/fluid/fluid_git.bb               | 27 --------------
 .../0001-remove-Werror-from-build-flags.patch |  0
 recipes-liri/liri-fluid/liri-fluid_git.bb     | 35 +++++++++++++++++++
 3 files changed, 35 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-liri/fluid/fluid_git.bb
 rename recipes-liri/{fluid => liri-fluid}/files/0001-remove-Werror-from-build-flags.patch (100%)
 create mode 100644 recipes-liri/liri-fluid/liri-fluid_git.bb

diff --git a/recipes-liri/fluid/fluid_git.bb b/recipes-liri/fluid/fluid_git.bb
deleted file mode 100644
index e3953188..00000000
--- a/recipes-liri/fluid/fluid_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "A collection of cross-platform QtQuick components for building fluid and dynamic applications"
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.MPL2;md5=815ca599c9df247a0c7f619bab123dad \
-"
-
-inherit liri
-
-SRC_URI += "file://0001-remove-Werror-from-build-flags.patch"
-PV = "0.9.0+git${SRCPV}"
-SRCREV = "554a83ea46ff1db9c11f89654777911f984c6b16"
-S = "${WORKDIR}/git"
-
-DEPENDS += " \
-    qtgraphicaleffects \
-    qtquickcontrols2 \
-    qtsvg \
-"
-
-do_configure_prepend() {
-    (cd ${S} && ./scripts/fetch_icons.sh)
-}
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
-FILES_${PN}-dev += " \
-    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
-"
diff --git a/recipes-liri/fluid/files/0001-remove-Werror-from-build-flags.patch b/recipes-liri/liri-fluid/files/0001-remove-Werror-from-build-flags.patch
similarity index 100%
rename from recipes-liri/fluid/files/0001-remove-Werror-from-build-flags.patch
rename to recipes-liri/liri-fluid/files/0001-remove-Werror-from-build-flags.patch
diff --git a/recipes-liri/liri-fluid/liri-fluid_git.bb b/recipes-liri/liri-fluid/liri-fluid_git.bb
new file mode 100644
index 00000000..1c79af6e
--- /dev/null
+++ b/recipes-liri/liri-fluid/liri-fluid_git.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Library for QtQuick apps with Material Design"
+LICENSE = "MPLv2"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.MPL2;md5=815ca599c9df247a0c7f619bab123dad \
+"
+
+inherit liri gtk-icon-cache
+
+PV = "1.1.0+git${SRCPV}"
+SRCREV = "ec6f8d84d4290ce37e3c25aeb3ed1cc69cd222f1"
+S = "${WORKDIR}/git"
+
+DEPENDS += " \
+    qtgraphicaleffects \
+    qtquickcontrols2 \
+    qtsvg \
+"
+
+do_configure_prepend() {
+    (cd ${S} && ./scripts/fetch_icons.sh)
+}
+
+# docs -> qdocs -> clang-native
+EXTRA_OECMAKE += " \
+    -DFLUID_WITH_DOCUMENTATION=OFF \
+"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_QML} \
+"
+FILES_${PN}-dev += " \
+    ${datadir}/icons \
+    ${datadir}/metainfo \
+    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
+"