Accepting request 910260 from home:xiaoguang_wang:branches:GNOME:Factory

- Add desktop-icons-show-iso-file-icon.patch: Show ISO file icon as
  default icon.
  (bsc#1183504 glgo#GNOME/World/ShellExtensions/desktop-icons!196)

- Drop desktop-icons-fix-version-match.patch: Replaced by
  desktop-icon-gnome-40.patch.
- Add desktop-icons-fix-version-match.patch: Match shell version
  under strict version checking (bsc#1176911).

OBS-URL: https://build.opensuse.org/request/show/910260
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extension-desktop-icons?expand=0&rev=13

desktop-icons-show-iso-file-icon.patch

@@ -0,0 +1,17 @@
+Index: desktop-icons-20.10.0/fileItem.js
+===================================================================
+--- desktop-icons-20.10.0.orig/fileItem.js
++++ desktop-icons-20.10.0/fileItem.js
+@@ -443,7 +443,11 @@ var FileItem = GObject.registerClass({
+     }
+ 
+     _createEmblemedStIcon(icon, iconName) {
+-        if (icon == null) {
++        if (icon != null) {
++            let theme = Gtk.IconTheme.get_default();
++            if (theme.lookup_by_gicon(icon, null, Gtk.IconLookupFlags.GENERIC_FALLBACK) == null)
++                icon = Gio.ThemedIcon.new_with_default_fallbacks('text-x-generic');
++        } else {
+             if (GLib.path_is_absolute(iconName)) {
+                 let iconFile = Gio.File.new_for_commandline_arg(iconName);
+                 icon = new Gio.FileIcon({ file: iconFile });

gnome-shell-extension-desktop-icons.changes

@@ -1,7 +1,16 @@
+-------------------------------------------------------------------
+Thu Aug  5 07:19:44 UTC 2021 - xiaoguang wang <xiaoguang.wang@suse.com>
+
+- Add desktop-icons-show-iso-file-icon.patch: Show ISO file icon as
+  default icon.
+  (bsc#1183504 glgo#GNOME/World/ShellExtensions/desktop-icons!196)
+
 -------------------------------------------------------------------
 Fri Mar 19 19:05:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
 - Add desktop-icon-gnome-40.patch: Declare compatible to GNOME 40.
+- Drop desktop-icons-fix-version-match.patch: Replaced by
+  desktop-icon-gnome-40.patch.
 
 -------------------------------------------------------------------
 Thu Mar 18 01:55:54 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
@@ -22,6 +31,12 @@ Thu Mar 18 01:55:54 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
   gnome-shell-extension-desktop-icons-add-mount-disk-icon.patch:
   Fixed upstream.
 
+-------------------------------------------------------------------
+Fri Nov 20 01:39:25 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
+
+- Add desktop-icons-fix-version-match.patch: Match shell version
+  under strict version checking (bsc#1176911).
+
 -------------------------------------------------------------------
 Mon Apr 27 02:56:44 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
 

gnome-shell-extension-desktop-icons.spec

@@ -26,6 +26,9 @@ URL:            https://gitlab.gnome.org/World/ShellExtensions/desktop-icons
 Source:         https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/5e2d0748cf79d255d7c23df6a6e6901b/desktop-icons-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM desktop-icon-gnome-40.patch dimstar@opensuse.org -- Make extension compatible with GNOME 40
 Patch0:         desktop-icon-gnome-40.patch
+# PATCH-FIX-UPSTREAM desktop-icons-show-iso-file-icon.patch bsc#1183504 glgo#GNOME/World/ShellExtensions/desktop-icons!196 xwang@suse.com -- Show ISO file icon.
+Patch1:         desktop-icons-show-iso-file-icon.patch
+
 BuildRequires:  gnome-patch-translation
 # Needed for directory ownership
 BuildRequires:  gnome-shell >= 3.30