From fb292ee1899d1246fcc1db84c71d4d9cb0f2f995 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 30 May 2022 00:31:28 +0300 Subject: [PATCH] Use new icons They were already in new ROSA icon themes. new-system-icons.tar.xz was not used. --- .abf.yml | 3 +-- 22x22_chromium.svg | 35 ++++++++++++++++++++++++++++++ 48x48_chromium.svg | 41 ++++++++++++++++++++++++++++++++++++ chromium-browser-stable.spec | 26 ++++++++++++++++++----- upd.sh | 3 ++- 5 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 22x22_chromium.svg create mode 100644 48x48_chromium.svg diff --git a/.abf.yml b/.abf.yml index ee2b660..7fb4474 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,7 +2,6 @@ sources: chromium-102.0.5005.61.tar.xz: abdbab7a0a39813a71d86a20a2900c9008d48d87 chromium-gost-b8bb24daca333ce67c0bb8f9d0c7103038020dbe.tar.gz: f466d681f56101e2cfa793caa297090d83b9441f depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 - icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 + icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 msspi-afe02c38f9b29883a033c652f548b09876e2f9b9.tar.gz: a7f4420db6b145a24c5f3e6d18d459513109914e - new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022 diff --git a/22x22_chromium.svg b/22x22_chromium.svg new file mode 100644 index 0000000..e17e380 --- /dev/null +++ b/22x22_chromium.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/48x48_chromium.svg b/48x48_chromium.svg new file mode 100644 index 0000000..817cbdb --- /dev/null +++ b/48x48_chromium.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 641721c..a03b7d9 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -99,11 +99,12 @@ Source30: master_preferences.json Source31: default_bookmarks.html Source32: chromium.default Source33: chromium-default-config.json -# by Dmitry Petrov +# Graphics by Dmitry Petrov Source34: rosa-logo-for-new-tab-page.svg -Source100: icons.tar.bz2 +Source35: 22x22_chromium.svg +Source36: 48x48_chromium.svg +Source100: icons-2012.tar.bz2 Source997: depot_tools.tar.xz -Source999: new-system-icons.tar.xz # segfaults on x86_32, but building with debuginfo is not possible, x86_32 has near to no users ExclusiveArch: %{x86_64} aarch64 @@ -272,7 +273,13 @@ if proprietary CryptoPro is installed. %{_crdir}/libvk_swiftshader.so %{_crdir}/vk_swiftshader_icd.json %{_datadir}/applications/*.desktop +%if %{mdvver} <= 201905 %{_iconsdir}/hicolor/*/apps/chromium* +%else +%{_iconsdir}/hicolor/22x22/apps/chromium-browser.svg +%{_iconsdir}/hicolor/48x48/apps/chromium-browser.svg +%{_iconsdir}/hicolor/scalable/apps/chromium-browser.svg +%endif # This crap does not work with rpm4 because it uses good locking of RPM DB %if %rpm5 @@ -325,7 +332,7 @@ members of the Chromium and WebDriver teams. #---------------------------------------------------------------------------- %prep -%setup -qn chromium-%{version} -a 997 -a 999 +%setup -qn chromium-%{version} -a 997 %if %{with gost} rm -rf %{_gostsourcedir} @@ -638,9 +645,18 @@ install -m 0644 %{SOURCE33} %{buildroot}%{_crdir} mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ -# icon +# keep old icons for old platforms +%if %{mdvver} <= 201905 mkdir -p %{buildroot}%{_iconsdir}/hicolor/ tar xjf %{SOURCE100} -C %{buildroot}%{_iconsdir}/hicolor/ +%else +mkdir -p %{buildroot}%{_iconsdir}/hicolor/22x22/apps +mkdir -p %{buildroot}%{_iconsdir}/hicolor/48x48/apps +mkdir -p %{buildroot}%{_iconsdir}/hicolor/scalable/apps +install -m0644 %{SOURCE35} %{buildroot}%{_iconsdir}/hicolor/22x22/apps/chromium-browser.svg +install -m0644 %{SOURCE36} %{buildroot}%{_iconsdir}/hicolor/48x48/apps/chromium-browser.svg +install -m0644 %{SOURCE36} %{buildroot}%{_iconsdir}/hicolor/scalable/apps/chromium-browser.svg +%endif mkdir -p %{buildroot}%{_sysconfdir}/%{crname} install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{crname}/ diff --git a/upd.sh b/upd.sh index 48dd186..01fcfbe 100755 --- a/upd.sh +++ b/upd.sh @@ -48,7 +48,8 @@ abf put -n git checkout master_preferences.json # store SVG in git git checkout rosa-logo-for-new-tab-page.svg -sed -i'' .abf.yml -e '/^ master_preferences.json/d' -e '/^ rosa-logo-for-new-tab-page.svg/d' +git checkout 22x22_chromium.svg 48x48_chromium.svg +sed -i'' .abf.yml -e '/^ master_preferences.json/d' -e '/.svg/d' # download additional sources abf fetch