From 8848f59f5622c403b03b371a0ec0cb55d01be125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 22 May 2021 03:35:12 +0200
Subject: [PATCH] remmina: upgrade 1.4.11 -> 1.4.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 1.4.11 fails to fetch
* do_install_append can go the only path left is metainfo and mime

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../{remmina_1.4.11.bb => remmina_1.4.17.bb}  | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)
 rename meta-oe/recipes-support/remmina/{remmina_1.4.11.bb => remmina_1.4.17.bb} (56%)

diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.11.bb b/meta-oe/recipes-support/remmina/remmina_1.4.17.bb
similarity index 56%
rename from meta-oe/recipes-support/remmina/remmina_1.4.11.bb
rename to meta-oe/recipes-support/remmina/remmina_1.4.17.bb
index 38fcf45c48..ef7876786c 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.4.11.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.4.17.bb
@@ -3,36 +3,44 @@ HOMEPAGE = "https://remmina.org"
 SECTION = "Support"
 LICENSE = "GPLv2 & openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
-DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile"
 
+DEPENDS = " \
+    glib-2.0-native \
+    openssl \
+    freerdp \
+    gtk+3 \
+    gdk-pixbuf \
+    atk \
+    libgcrypt \
+    libsodium \
+    libssh \
+    vte \
+    json-glib \
+    libsoup-2.4 \
+    libvncserver \
+    libsecret \
+    libxkbfile \
+"
 
 DEPENDS_append_libc-musl = " libexecinfo"
 LDFLAGS_append_libc-musl = " -lexecinfo"
 
-SRCREV = "6a8737111adebf571c46f35599cc62e7f7b0bd65"
-SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=rel/v1.4.11 \
-"
-
-PV .= "+git${SRCPV}"
-
+SRCREV = "0ef1621b3e16b3168213147a2bfca39da2c2668f"
+SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https"
 S = "${WORKDIR}/git"
 
-inherit cmake features_check mime-xdg
+inherit cmake features_check mime mime-xdg gtk-icon-cache
 REQUIRED_DISTRO_FEATURES = "x11"
 
 EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF"
 
-do_install_append(){
-    # We dont need the extra stuff form other desktop environments
-    rm -rf ${D}/${datadir}/xsessions
-    rm -rf ${D}/${datadir}/metainfo
-    rm -rf ${D}/${datadir}/gnome-session
-}
-
 PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol"
 # Switch on gtk support in avahi recipe if you want to enable avahi support
 PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi"
 
 RDEPENDS_${PN} = "bash"
 
-FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
+FILES_${PN}+= " \
+    ${datadir}/metainfo \
+    ${datadir}/mime \
+"