mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-23 15:32:54 +00:00
Use new icons
They were already in new ROSA icon themes. new-system-icons.tar.xz was not used.
This commit is contained in:
Mikhail Novosyolov
parent
409a775328
commit
fb292ee189
5 changed files with 100 additions and 8 deletions
3
.abf.yml
3
.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
|
||||
|
|
|
|||
35
22x22_chromium.svg
Normal file
35
22x22_chromium.svg
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
|
||||
<g>
|
||||
<path fill="#F0F0F1" d="M15,11c0,2.208-1.792,4-4,4s-4-1.792-4-4s1.792-4,4-4S15,8.792,15,11z"/>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.7157" y1="-20.3422" x2="13.9296" y2="-14.9115" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#64A5E1"/>
|
||||
<stop offset="1" style="stop-color:#508CC8"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_1_)" d="M13.932,13.084l-3.264,5.908C6.404,18.82,3,15.304,3,11c0-4.416,3.584-8,8-8v4.4
|
||||
c-1.988,0-3.6,1.612-3.6,3.6s1.612,3.6,3.6,3.6C12.212,14.6,13.28,14.004,13.932,13.084z"/>
|
||||
|
||||
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.832" y1="-9" x2="14.832" y2="-20.5188" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#AFE1FA"/>
|
||||
<stop offset="1" style="stop-color:#78B4DC"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_2_)" d="M19,11c0,4.42-3.58,8-8,8h-0.336l3.268-5.916C14.352,12.496,14.6,11.776,14.6,11
|
||||
c0-1.988-1.612-3.6-3.6-3.6V3c3.124,0,5.82,1.792,7.14,4.4C18.684,8.484,19,9.704,19,11z"/>
|
||||
|
||||
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.8514" y1="-24.3189" x2="6.0295" y2="-18.1815" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#508CC8"/>
|
||||
<stop offset="1" style="stop-color:#2864A0"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_3_)" d="M18.136,7.4H11c-1.988,0-3.6,1.612-3.6,3.6c0,0.596,0.144,1.156,0.404,1.652H7.8L4.264,6.704H4.256
|
||||
C5.672,4.476,8.164,3,11,3C14.12,3,16.82,4.792,18.136,7.4z"/>
|
||||
|
||||
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.0199" y1="-18.98" x2="12.9801" y2="-15.0199" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#64A5E1"/>
|
||||
<stop offset="1" style="stop-color:#2864A0"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_4_)" d="M13.8,11c0,1.547-1.253,2.8-2.8,2.8S8.2,12.547,8.2,11S9.453,8.2,11,8.2S13.8,9.453,13.8,11z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
41
48x48_chromium.svg
Normal file
41
48x48_chromium.svg
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<circle opacity="0.05" cx="24" cy="24" r="21"/>
|
||||
<circle opacity="0.07" cx="24" cy="24" r="20.5"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#F0F0F1" d="M34,24c0,5.521-4.479,10-10,10s-10-4.479-10-10s4.479-10,10-10S34,18.479,34,24z"/>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.7893" y1="-12.3556" x2="31.324" y2="1.2212" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#64A5E1"/>
|
||||
<stop offset="1" style="stop-color:#508CC8"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_1_)" d="M31.33,29.21l-8.16,14.77C12.51,43.55,4,34.76,4,24C4,12.96,12.96,4,24,4v11c-4.97,0-9,4.03-9,9
|
||||
s4.03,9,9,9C27.03,33,29.7,31.51,31.33,29.21z"/>
|
||||
|
||||
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="33.58" y1="16" x2="33.58" y2="-12.797" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#AFE1FA"/>
|
||||
<stop offset="1" style="stop-color:#78B4DC"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_2_)" d="M44,24c0,11.05-8.95,20-20,20h-0.84l8.17-14.79C32.38,27.74,33,25.94,33,24c0-4.97-4.03-9-9-9V4
|
||||
c7.81,0,14.55,4.48,17.85,11C43.21,17.71,44,20.76,44,24z"/>
|
||||
|
||||
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="36.1284" y1="-22.2971" x2="11.5736" y2="-6.9537" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#508CC8"/>
|
||||
<stop offset="1" style="stop-color:#2864A0"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_3_)" d="M41.84,15H24c-4.97,0-9,4.03-9,9c0,1.49,0.36,2.89,1.01,4.13H16L7.16,13.26H7.14
|
||||
C10.68,7.69,16.91,4,24,4C31.8,4,38.55,8.48,41.84,15z"/>
|
||||
|
||||
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="19.0499" y1="-8.9501" x2="28.9501" y2="0.9501" gradientTransform="matrix(1 0 0 1 0 28)">
|
||||
<stop offset="0" style="stop-color:#64A5E1"/>
|
||||
<stop offset="1" style="stop-color:#2864A0"/>
|
||||
</linearGradient>
|
||||
<path fill="url(#SVGID_4_)" d="M31,24c0,3.867-3.133,7-7,7s-7-3.133-7-7s3.133-7,7-7S31,20.133,31,24z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
|
|
@ -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}/
|
||||
|
|
|
|||
3
upd.sh
3
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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue