From 9cabe866fdb667f4095bc2ec1878bab9aae24c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 12 Mar 2018 23:03:11 +0100
Subject: [PATCH] replace oxygen-icons by oxygen-icons5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

oxygen-icons5 is no more allarch - (extra-)cmake tries to find a compiler which
is not available for allarch.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-kde/apps/oxygen-icons/oxygen-icons.bb | 16 ---------------
 .../kf5/tier1/oxygen-icons/oxygen-icons5.bb   | 20 +++++++++++++++++++
 recipes-kde/packagegroups/kde-apps.bb         |  1 -
 recipes-kde/packagegroups/kf5-world.bb        |  1 +
 .../packagegroups/packagegroup-lxqt-base.bb   |  2 +-
 5 files changed, 22 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-kde/apps/oxygen-icons/oxygen-icons.bb
 create mode 100644 recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb

diff --git a/recipes-kde/apps/oxygen-icons/oxygen-icons.bb b/recipes-kde/apps/oxygen-icons/oxygen-icons.bb
deleted file mode 100644
index faae3dea..00000000
--- a/recipes-kde/apps/oxygen-icons/oxygen-icons.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "KDE oxygen icons"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=6e01bfa20e899e8ad569d5488923cbd2 \
-"
-
-inherit kde-apps allarch gtk-icon-cache
-
-PV = "15.04.3"
-SRC_URI = "${KDE_MIRROR}/Attic/applications/${PV}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "4f24f975fb90d8daab833fc719ce39a3"
-SRC_URI[sha256sum] = "133b66d70b51641f841799674afd993a6af0d9d9b646021a0ed609beb2ffd71e"
-
-FILES_${PN} += " \
-    ${datadir}/icons/oxygen \
-"
diff --git a/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
new file mode 100644
index 00000000..f67740cd
--- /dev/null
+++ b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
@@ -0,0 +1,20 @@
+SUMMARY = "KDE oxygen icons"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=6e01bfa20e899e8ad569d5488923cbd2 \
+"
+
+inherit kde-kf5 gtk-icon-cache
+
+SRC_URI[md5sum] = "61ceb7583096c6ab70690a1e941dac8f"
+SRC_URI[sha256sum] = "ec7208b82e7439fd97ee22ff0ff4221620ab255a017fced74a5f40c3ac04888d"
+
+PV = "${KF5_VERSION}"
+
+FILES_${PN} += " \
+    ${datadir}/icons/oxygen \
+"
+
+RPROVIDES_${PN} += "oxygen-icons"
+RREPLACES_${PN} += "oxygen-icons"
+RCONFLICTS_${PN} += "oxygen-icons"
diff --git a/recipes-kde/packagegroups/kde-apps.bb b/recipes-kde/packagegroups/kde-apps.bb
index 3e263b2e..2b6d7bc4 100644
--- a/recipes-kde/packagegroups/kde-apps.bb
+++ b/recipes-kde/packagegroups/kde-apps.bb
@@ -34,7 +34,6 @@ RDEPENDS_${PN} = " \
     minuet \
     okteta \
     okular \
-    oxygen-icons \
     spectacle \
     umbrello \
 "
diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb
index 5c1cdef1..224884e3 100644
--- a/recipes-kde/packagegroups/kf5-world.bb
+++ b/recipes-kde/packagegroups/kf5-world.bb
@@ -76,6 +76,7 @@ TIER_3 = " \
     kwallet \
     kxmlgui \
     kxmlrpcclient \
+    oxygen-icons5 \
     plasma-framework \
     purpose \
     qqc2-desktop-style \
diff --git a/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb b/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb
index cfe6339a..5280273c 100644
--- a/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb
+++ b/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} = " \
     qtimageformats-plugins \
     \
     lxqt-world \
-    oxygen-icons \
+    oxygen-icons5 \
     \
     openbox \
     openbox-theme-artwiz-boxed \