From d82564509cd6404cd960815f73878af5ab254e2a Mon Sep 17 00:00:00 2001
From: Slava Monich <slava.monich@jolla.com>
Date: Wed, 21 Oct 2015 13:31:48 +0300
Subject: [PATCH] [app] Package icons in a different way

Otherwise deployment from QtCreator may fail.
---
 app/app.pro                                   |  19 +++++++++++++++++-
 .../108x108/harbour-books.png}                | Bin
 .../128x128/harbour-books.png}                | Bin
 .../256x256/harbour-books.png}                | Bin
 app/{ => icons/86x86}/harbour-books.png       | Bin
 app/{ => icons}/harbour-books.svg             |   0
 rpm/harbour-books.spec                        |   5 -----
 7 files changed, 18 insertions(+), 6 deletions(-)
 rename app/{harbour-books-108.png => icons/108x108/harbour-books.png} (100%)
 rename app/{harbour-books-128.png => icons/128x128/harbour-books.png} (100%)
 rename app/{harbour-books-256.png => icons/256x256/harbour-books.png} (100%)
 rename app/{ => icons/86x86}/harbour-books.png (100%)
 rename app/{ => icons}/harbour-books.svg (100%)

diff --git a/app/app.pro b/app/app.pro
index fa7fdcb..c4d2fad 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -34,7 +34,7 @@ LIBS += \
   -lbz2 -lz -ldl
 
 OTHER_FILES += \
-  harbour-books.png \
+  icons/harbour-books.svg \
   harbour-books.desktop \
   qml/*.qml \
   qml/images/* \
@@ -46,6 +46,7 @@ OTHER_FILES += \
 TARGET_DATA_DIR = /usr/share/harbour-books
 TARGET_DEFAULT_DATA_DIR = $$TARGET_DATA_DIR/data
 TARGET_ZLIBRARY_DATA_DIR = $$TARGET_DEFAULT_DATA_DIR
+TARGET_ICON_ROOT = /usr/share/icons/hicolor
 
 core_data.files = \
   data/zlibrary/core/*.gz \
@@ -67,6 +68,22 @@ formats.files = data/formats/*
 formats.path = $$TARGET_DEFAULT_DATA_DIR/formats
 INSTALLS += formats
 
+icon86.files = icons/86x86/harbour-books.png
+icon86.path = $$TARGET_ICON_ROOT/86x86/apps
+INSTALLS += icon86
+
+icon108.files = icons/108x108/harbour-books.png
+icon108.path = $$TARGET_ICON_ROOT/108x108/apps
+INSTALLS += icon108
+
+icon128.files = icons/128x128/harbour-books.png
+icon128.path = $$TARGET_ICON_ROOT/128x128/apps
+INSTALLS += icon128
+
+icon256.files = icons/256x256/harbour-books.png
+icon256.path = $$TARGET_ICON_ROOT/256x256/apps
+INSTALLS += icon256
+
 CONFIG += sailfishapp_i18n sailfishapp_i18n_idbased
 TRANSLATIONS += \
     translations/harbour-books.ts \
diff --git a/app/harbour-books-108.png b/app/icons/108x108/harbour-books.png
similarity index 100%
rename from app/harbour-books-108.png
rename to app/icons/108x108/harbour-books.png
diff --git a/app/harbour-books-128.png b/app/icons/128x128/harbour-books.png
similarity index 100%
rename from app/harbour-books-128.png
rename to app/icons/128x128/harbour-books.png
diff --git a/app/harbour-books-256.png b/app/icons/256x256/harbour-books.png
similarity index 100%
rename from app/harbour-books-256.png
rename to app/icons/256x256/harbour-books.png
diff --git a/app/harbour-books.png b/app/icons/86x86/harbour-books.png
similarity index 100%
rename from app/harbour-books.png
rename to app/icons/86x86/harbour-books.png
diff --git a/app/harbour-books.svg b/app/icons/harbour-books.svg
similarity index 100%
rename from app/harbour-books.svg
rename to app/icons/harbour-books.svg
diff --git a/rpm/harbour-books.spec b/rpm/harbour-books.spec
index 14bb3c0..fa0d9af 100644
--- a/rpm/harbour-books.spec
+++ b/rpm/harbour-books.spec
@@ -45,11 +45,6 @@ desktop-file-install --delete-original \
   --dir %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/applications/*.desktop
 
-for x in 108 128 256 ; do \
-  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps ; \
-  cp %{name}-${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/%{name}.png ; \
-done
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}