[app] Package icons in a different way

Otherwise deployment from QtCreator may fail.
This commit is contained in:
Slava Monich 2015-10-21 13:31:48 +03:00
parent eda98440cf
commit d82564509c
7 changed files with 18 additions and 6 deletions

View file

@ -34,7 +34,7 @@ LIBS += \
-lbz2 -lz -ldl -lbz2 -lz -ldl
OTHER_FILES += \ OTHER_FILES += \
harbour-books.png \ icons/harbour-books.svg \
harbour-books.desktop \ harbour-books.desktop \
qml/*.qml \ qml/*.qml \
qml/images/* \ qml/images/* \
@ -46,6 +46,7 @@ OTHER_FILES += \
TARGET_DATA_DIR = /usr/share/harbour-books TARGET_DATA_DIR = /usr/share/harbour-books
TARGET_DEFAULT_DATA_DIR = $$TARGET_DATA_DIR/data TARGET_DEFAULT_DATA_DIR = $$TARGET_DATA_DIR/data
TARGET_ZLIBRARY_DATA_DIR = $$TARGET_DEFAULT_DATA_DIR TARGET_ZLIBRARY_DATA_DIR = $$TARGET_DEFAULT_DATA_DIR
TARGET_ICON_ROOT = /usr/share/icons/hicolor
core_data.files = \ core_data.files = \
data/zlibrary/core/*.gz \ data/zlibrary/core/*.gz \
@ -67,6 +68,22 @@ formats.files = data/formats/*
formats.path = $$TARGET_DEFAULT_DATA_DIR/formats formats.path = $$TARGET_DEFAULT_DATA_DIR/formats
INSTALLS += 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 CONFIG += sailfishapp_i18n sailfishapp_i18n_idbased
TRANSLATIONS += \ TRANSLATIONS += \
translations/harbour-books.ts \ translations/harbour-books.ts \

View file

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View file

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

@ -45,11 +45,6 @@ desktop-file-install --delete-original \
--dir %{buildroot}%{_datadir}/applications \ --dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/*.desktop %{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 %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/%{name} %{_bindir}/%{name}