diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec index 8a709ef6..ba04e0d0 100644 --- a/rpm/patchmanager.spec +++ b/rpm/patchmanager.spec @@ -1,4 +1,3 @@ -%global theme sailfish-default # These macros should already be defined in the RPMbuild environment, see: rpm --showrc %{!?qtc_qmake5:%define qtc_qmake5 %qmake5} @@ -291,7 +290,13 @@ exit 0 %{_datadir}/jolla-settings/entries/%{name}.json %{_datadir}/%{name}/icons/icon-m-patchmanager.png -%{_datadir}/themes/%{theme}/meegotouch/*/icons/*.png +# pre 4.6: +# /usr/share/themes/sailfish-default/meegotouch/zX.Y/icons/*.png +# 4.6 and higher: +# /usr/share/themes/sailfish-default/silica/zX.Y/icons/*.png +# /usr/share/themes/sailfish-default/silica/zX.Y/icons-monochrome/*.png +%{_datadir}/themes/sailfish-default/*/*/*/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg %changelog * Thu Sep 9 1999 SailfishOS Patches - 99.99.99 diff --git a/src/icons/README.md b/src/icons/README.md new file mode 100644 index 00000000..55d48b02 --- /dev/null +++ b/src/icons/README.md @@ -0,0 +1,12 @@ +sailfish-svg2png: + +For all SailfishOS versions up to v4.6 (and possible also Meego): + + - svg files must be in svgs/ + - png files will be in /usr/share/sailfish-default/meegotouch/zX.Y/icons + +For SailishOS 4.6 and higher + + - svg files must be in svgs/icons and svgs/icons-monochrome + - png files will be in /usr/share/sailfish-default/silica/zX.Y/icons and /usr/share/sailfish-default/silica/zX.Y/icons-monochrome + diff --git a/src/icons/icons.pro b/src/icons/icons.pro index 7ff03bd8..40feb8c9 100644 --- a/src/icons/icons.pro +++ b/src/icons/icons.pro @@ -1,29 +1,11 @@ TEMPLATE = aux + # Configures svg to png THEMENAME=sailfish-default -load(sailfish-svg2png-sizes) - -theme.path = /usr/share/themes/$${THEMENAME}/ -themeDirectory.path = /usr/share/themes/$${THEMENAME}/meegotouch -themeDirectory.files += $${OUT_PWD}/icons - -for(profile, SAILFISH_SVG2PNG.profiles) { - # a work-around for installing directories that do not exist yet - system(mkdir -p $${OUT_PWD}/z$${profile}) - - exists( $${OUT_PWD}/symlinks ): svg2png.commands += cp -r symlinks/icons z$${profile} && - - svg2png.commands += /usr/bin/sailfish_svg2png \ - -z $$eval(SAILFISH_SVG2PNG.scales.$${profile}) \ - $$eval(SAILFISH_SVG2PNG.extra.$${profile}) \ - $${_PRO_FILE_PWD_}/svgs \ - z$${profile}/icons && - - svg2png.files += $${OUT_PWD}/z$${profile} -} - -svg2png.commands += true -svg2png.path = $${themeDirectory.path} +CONFIG += sailfish-svg2png -INSTALLS += svg2png theme themeDirectory +# also install SVG: +svg.path = /usr/share/icons/hicolor/scalable/apps +svg.files = svgs/icon-m-patchmanager2.svg +INSTALLS += svg diff --git a/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg b/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg new file mode 100644 index 00000000..f123437a --- /dev/null +++ b/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/icons/svgs/icons/icon-m-patchmanager2.svg b/src/icons/svgs/icons/icon-m-patchmanager2.svg new file mode 100644 index 00000000..f123437a --- /dev/null +++ b/src/icons/svgs/icons/icon-m-patchmanager2.svg @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + +