From f21cb3d2338abb47ebc00bf3e68e25aa986550a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 14 Jan 2021 14:56:40 +0000
Subject: [PATCH] icons: install svg files into the "scalable" directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The USB SVG was mistakenly installed into a size specific dir, while the
main logo was not installed at all.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 configure.ac                                  |  1 +
 icons/24x24/Makefile.am                       |  2 +-
 icons/Makefile.am                             |  2 +-
 icons/scalable/Makefile.am                    | 12 ++++++++++++
 icons/{24x24 => scalable}/virt-viewer-usb.svg |  0
 icons/{ => scalable}/virt-viewer.svg          |  0
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 icons/scalable/Makefile.am
 rename icons/{24x24 => scalable}/virt-viewer-usb.svg (100%)
 rename icons/{ => scalable}/virt-viewer.svg (100%)

diff --git a/configure.ac b/configure.ac
index 469559f..c3db407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,6 +252,7 @@ AC_CONFIG_FILES([
     icons/32x32/Makefile
     icons/48x48/Makefile
     icons/256x256/Makefile
+    icons/scalable/Makefile
     man/Makefile
     mingw-virt-viewer.spec
     po/Makefile
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index f2b6388..d5d4a87 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -6,7 +6,7 @@ apps_icon_DATA = $(PACKAGE).png
 EXTRA_DIST += $(apps_icon_DATA)
 
 devices_icondir = $(datadir)/icons/hicolor/$(size)/devices/
-devices_icon_DATA = virt-viewer-usb.png virt-viewer-usb.svg
+devices_icon_DATA = $(PACKAGE)-usb.png
 EXTRA_DIST += $(devices_icon_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 0b4c247..08d274d 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable
 
 if OS_WIN32
 noinst_DATA = virt-viewer.ico
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
new file mode 100644
index 0000000..939388e
--- /dev/null
+++ b/icons/scalable/Makefile.am
@@ -0,0 +1,12 @@
+EXTRA_DIST =
+size = $(notdir $(PWD))
+
+apps_icondir = $(datadir)/icons/hicolor/$(size)/apps/
+apps_icon_DATA = $(PACKAGE).svg
+EXTRA_DIST += $(apps_icon_DATA)
+
+devices_icondir = $(datadir)/icons/hicolor/$(size)/devices/
+devices_icon_DATA = $(PACKAGE)-usb.svg
+EXTRA_DIST += $(devices_icon_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/24x24/virt-viewer-usb.svg b/icons/scalable/virt-viewer-usb.svg
similarity index 100%
rename from icons/24x24/virt-viewer-usb.svg
rename to icons/scalable/virt-viewer-usb.svg
diff --git a/icons/virt-viewer.svg b/icons/scalable/virt-viewer.svg
similarity index 100%
rename from icons/virt-viewer.svg
rename to icons/scalable/virt-viewer.svg