joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 19:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch linux to SVG icon

Browse Source 
I found that the icon used by DOSBox-X comes from
https://www.vogons.org/viewtopic.php?p=79575#p79575

Which apart from Windows and Mac icons also included a SVG icon
which is preferred on Linux, and looks nicer. So add the SVG icon
and update 'make install' and make-rpm.sh to use it.
The SVG icon is placed in contrib/icons

p.s. I found that the tar operation in make-rpm.sh blindly assumes
the directory containing the tree to be named "dosbox-x", instead
of just the current directory, it effectively will tar
../dosbox-x even if your in, say, dosbox-x.clone to keep different
trees apart... I did not change this for now, but it is something
to watch out for.
This commit is contained in:
rderooy 2020-09-08 16:09:42 +02:00
parent c63e3e6232
commit 662e2a64b9
4 changed files with 118 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -75,8 +75,8 @@ install: src/dosbox-x
install -m 644 CHANGELOG $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 font/FREECG98.BMP $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 dosbox-x.reference.conf $(DESTDIR)$(prefix)/share/dosbox-x
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
install -m 644 src/dosbox.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/dosbox-x.png
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps
install -m 644 contrib/icons/dosbox-x.svg $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg
mkdir -p $(DESTDIR)$(prefix)/share/applications
install -m 644 contrib/linux/dosbox-x.desktop $(DESTDIR)$(prefix)/share/applications
mkdir -p $(DESTDIR)$(prefix)/share/metainfo
@ -92,6 +92,7 @@ uninstall:
rm -f $(DESTDIR)$(prefix)/share/dosbox-x/*
rmdir $(DESTDIR)$(prefix)/share/dosbox-x
rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/dosbox-x.png
rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg
rm -f $(DESTDIR)$(prefix)/share/applications/dosbox-x.desktop
rm -f $(DESTDIR)$(prefix)/share/metainfo/dosbox-x.appdata.xml

110
contrib/icons/dosbox-x.svg Normal file
View File

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_svg "http://www.w3.org/2000/svg">
<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="30.544" height="36.001"
viewBox="0 0 30.544 36.001" overflow="visible" enable-background="new 0 0 30.544 36.001" xml:space="preserve">
<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M15.788,35.988c-0.578-0.034-1.146-0.144-1.696-0.335
c-1.287-0.447-2.238-1.354-2.812-2.558c-0.395-0.827-0.205-1.776,0.393-2.394l0.226-0.188l-0.268-0.295
c-0.412-0.579-0.679-1.23-0.801-1.926c-0.181-1.03-0.041-2.038,0.437-2.932l0.271-0.393l-0.258-0.205l-0.126,0.233
c-0.805,1.191-2.075,1.732-3.308,1.951L4.03,27.621c-0.145,0.026-0.288,0.036-0.429,0.032c-0.987-0.027-1.852-0.745-2.03-1.754
l-1.538-8.725c-0.096-0.538,0.022-1.067,0.293-1.498l1.384-2.492c0.309-0.49,0.814-0.854,1.43-0.961l3.398-0.599l0.803-0.095
L6.299,5.622c-0.083-0.468-0.005-0.927,0.193-1.32l1.551-2.771c0.313-0.439,0.79-0.76,1.362-0.861l3.214-0.566
c1.749-0.31,3.418,0.068,4.803,1.209c1.307,1.074,2.078,2.523,2.371,4.197c0.225,1.266,0.141,2.504-0.296,3.657l-0.106,0.218
l0.24-0.069l1.828-0.321c0.561-0.099,1.127,0.032,1.58,0.348l0.172,0.156l0.108-0.207c0.32-0.453,0.809-0.769,1.367-0.867
l1.828-0.321c1.609-0.284,2.924,1.284,2.361,2.818l-1.335,3.656l2.502,2.972c0.561,0.665,0.625,1.521,0.321,2.219l-1.496,2.713
c-0.295,0.509-0.802,0.901-1.464,1.019l-1.834,0.323c-0.56,0.099-1.126-0.031-1.581-0.347l-0.164-0.15l-0.103,0.196
c-0.318,0.453-0.807,0.77-1.366,0.868l-0.021,0.004l-0.115,0.361l-0.104,0.138l0.203,0.155c0.687,0.693,1.132,1.546,1.302,2.509
s0.072,1.903-0.311,2.755l-1.567,2.852c-0.175,0.313-0.391,0.609-0.649,0.889c-0.948,1.026-2.207,1.589-3.567,1.829
C16.946,35.984,16.365,36.023,15.788,35.988z"/>
<linearGradient id="XMLID_50_" gradientUnits="userSpaceOnUse" x1="-403.4668" y1="210.7578" x2="-402.4668" y2="210.7578" gradientTransform="matrix(-4.2 -4.65 4.65 -4.2 -2649.594 -974.9042)">
<stop offset="0" style="stop-color:#29AD29"/>
<stop offset="1" style="stop-color:#8FE08F"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#XMLID_50_)" d="M21.603,20.494c-0.28,0.049-0.51-0.224-0.411-0.491
l1.683-4.603l-3.157-3.756c-0.183-0.218-0.062-0.553,0.219-0.602l1.828-0.321c0.13-0.023,0.262,0.024,0.347,0.126l1.694,2.012
l0.903-2.471c0.045-0.124,0.153-0.215,0.282-0.237l1.829-0.322c0.279-0.049,0.508,0.225,0.41,0.49l-1.684,4.61l3.156,3.749
c0.183,0.218,0.062,0.552-0.218,0.602l-1.834,0.323c-0.13,0.022-0.262-0.025-0.348-0.126l-1.686-2.005l-0.899,2.461
c-0.045,0.124-0.152,0.214-0.281,0.236L21.603,20.494z"/>
<g enable-background="new ">
<g>
<defs>
<rect id="XMLID_40_" x="9.375" y="1.604" width="8.924" height="10.281"/>
</defs>
<clipPath id="XMLID_51_">
<use xlink:href="#XMLID_40_" />
</clipPath>
<linearGradient id="XMLID_52_" gradientUnits="userSpaceOnUse" x1="-403.4668" y1="210.6367" x2="-402.4668" y2="210.6367" gradientTransform="matrix(-4.2 -4.95 4.95 -4.2 -2722.5657 -1104.1949)">
<stop offset="0" style="stop-color:#E23904"/>
<stop offset="1" style="stop-color:#F2AD9B"/>
</linearGradient>
<path clip-path="url(#XMLID_51_)" fill-rule="evenodd" clip-rule="evenodd" fill="url(#XMLID_52_)" d="M13.002,9.488l0.947-0.167
c0.598-0.105,1.061-0.414,1.403-0.944c0.327-0.508,0.44-1.231,0.266-2.224c-0.139-0.789-0.45-1.398-0.917-1.85
c-0.451-0.436-0.95-0.591-1.533-0.487l-1.131,0.199L13.002,9.488z M11.376,11.849c-0.2,0.036-0.392-0.1-0.427-0.3L9.41,2.825
c-0.035-0.201,0.099-0.392,0.3-0.428l3.214-0.567c1.286-0.227,2.427,0.048,3.385,0.836c0.944,0.778,1.527,1.835,1.759,3.147
c0.231,1.313,0.032,2.507-0.616,3.554c-0.663,1.072-1.755,1.72-3.212,1.978L11.376,11.849z"/>
</g>
</g>
<g enable-background="new ">
<g>
<defs>
<rect id="XMLID_43_" x="11.617" y="11.675" width="8.635" height="10.029"/>
</defs>
<clipPath id="XMLID_53_">
<use xlink:href="#XMLID_43_" />
</clipPath>
<linearGradient id="XMLID_54_" gradientUnits="userSpaceOnUse" x1="-403.4668" y1="210.7148" x2="-402.4668" y2="210.7148" gradientTransform="matrix(3.75 5.7 -5.7 3.75 2727.5591 1522.6085)">
<stop offset="0" style="stop-color:#F29CFF"/>
<stop offset="1" style="stop-color:#BF00FF"/>
</linearGradient>
<path clip-path="url(#XMLID_53_)" fill-rule="evenodd" clip-rule="evenodd" fill="url(#XMLID_54_)" d="M16.048,19.655
c0.117,0.007,0.239-0.002,0.367-0.024c0.449-0.078,0.798-0.325,1.059-0.776c0.238-0.417,0.309-1.187,0.095-2.406
c-0.171-0.969-0.454-1.655-0.821-2.098c-0.335-0.404-0.753-0.559-1.311-0.459c-1.007,0.177-1.524,1.039-1.146,3.182
c0.181,1.024,0.475,1.71,0.846,2.118C15.401,19.483,15.699,19.637,16.048,19.655z M15.837,21.693
c-0.885-0.03-1.67-0.357-2.338-0.99c-0.866-0.817-1.409-1.913-1.646-3.254c-0.236-1.34-0.074-2.549,0.508-3.609
c0.59-1.076,1.517-1.729,2.75-1.945c1.238-0.22,2.327,0.078,3.226,0.898c0.879,0.803,1.43,1.893,1.667,3.239
c0.248,1.408,0.098,2.648-0.493,3.689c-0.595,1.051-1.526,1.687-2.757,1.903C16.438,21.682,16.132,21.704,15.837,21.693z"/>
</g>
</g>
<g enable-background="new ">
<g>
<defs>
<rect id="XMLID_46_" x="3.108" y="13.216" width="8.526" height="10.222"/>
</defs>
<clipPath id="XMLID_55_">
<use xlink:href="#XMLID_46_" />
</clipPath>
<linearGradient id="XMLID_56_" gradientUnits="userSpaceOnUse" x1="-403.4668" y1="210.6211" x2="-402.4668" y2="210.6211" gradientTransform="matrix(-5.1 -4.8 4.8 -5.1 -3060.0747 -842.6082)">
<stop offset="0" style="stop-color:#076BCF"/>
<stop offset="1" style="stop-color:#91C7FD"/>
</linearGradient>
<path clip-path="url(#XMLID_55_)" fill-rule="evenodd" clip-rule="evenodd" fill="url(#XMLID_56_)" d="M5.942,17.286l1.554-0.272
c0.315-0.058,0.507-0.185,0.626-0.36c0.127-0.187,0.176-0.405,0.126-0.684c-0.056-0.317-0.183-0.471-0.345-0.55
c-0.216-0.105-0.458-0.14-0.736-0.091l-1.522,0.27L5.942,17.286z M6.604,21.038l1.669-0.294c0.366-0.064,0.593-0.203,0.732-0.381
c0.137-0.176,0.192-0.393,0.142-0.689c-0.049-0.273-0.176-0.46-0.375-0.589c-0.202-0.129-0.459-0.182-0.807-0.12L6.29,19.261
L6.604,21.038z M5.11,23.402c-0.201,0.035-0.393-0.099-0.427-0.3l-1.539-8.725c-0.036-0.199,0.099-0.392,0.299-0.427l3.4-0.6
c0.599-0.106,1.125-0.136,1.575-0.076c0.492,0.064,0.934,0.3,1.323,0.673c0.407,0.39,0.657,0.885,0.759,1.465
c0.1,0.56,0.022,1.087-0.239,1.571L9.87,17.471l0.417,0.183c0.133,0.075,0.259,0.163,0.375,0.266
c0.453,0.396,0.732,0.91,0.839,1.523c0.134,0.761-0.002,1.463-0.419,2.084c-0.438,0.648-1.185,1.031-2.157,1.203L5.11,23.402z"/>
</g>
</g>
<linearGradient id="XMLID_57_" gradientUnits="userSpaceOnUse" x1="-403.4668" y1="210.623" x2="-402.4668" y2="210.623" gradientTransform="matrix(-4.5 -4.5 4.5 -4.5 -2744.124 -839.3135)">
<stop offset="0" style="stop-color:#FFDA2A"/>
<stop offset="1" style="stop-color:#FFFE95"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#XMLID_57_)" d="M17.278,31.746c-0.426-0.025-0.835-0.105-1.227-0.242
c-0.813-0.281-1.418-0.844-1.804-1.655c-0.092-0.191-0.002-0.421,0.195-0.5l1.47-0.597c0.189-0.075,0.405,0.017,0.481,0.205
c0.24,0.602,0.792,0.9,1.93,0.7c0.518-0.091,0.84-0.255,1.025-0.451c0.193-0.202,0.244-0.39,0.211-0.585
c-0.029-0.163-0.102-0.305-0.225-0.433c-0.074-0.076-0.274-0.176-0.723-0.211l-1.745-0.141c-0.612-0.05-1.116-0.147-1.479-0.316
c-0.373-0.172-0.688-0.448-0.943-0.81c-0.258-0.361-0.425-0.767-0.503-1.212c-0.156-0.884,0.05-1.674,0.623-2.335
c0.562-0.648,1.345-1.049,2.313-1.219c0.806-0.143,1.568-0.095,2.282,0.152c0.733,0.253,1.273,0.715,1.587,1.387
c0.087,0.187,0.004,0.41-0.185,0.494l-1.432,0.634c-0.174,0.077-0.379,0.009-0.472-0.158c-0.25-0.449-0.667-0.651-1.398-0.522
c-0.446,0.079-0.71,0.222-0.854,0.387c-0.151,0.169-0.197,0.338-0.162,0.537c0.041,0.229,0.25,0.476,1.062,0.531l1.549,0.108
c0.97,0.07,1.74,0.309,2.221,0.79c0.436,0.44,0.711,0.968,0.818,1.575c0.17,0.963-0.062,1.812-0.704,2.509
c-0.627,0.678-1.5,1.102-2.585,1.293C18.147,31.743,17.704,31.771,17.278,31.746z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

8
contrib/linux/dosbox-x.spec.in
View File

@ -13,7 +13,7 @@ URL: http://www.dosbox-x.com
Group: Applications/Emulators
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz
Source1: dosbox-x.desktop
Source2: dosbox-x.png
Source2: dosbox-x.svg
Source3: dosbox-x.appdata.xml
%description
@ -44,15 +44,15 @@ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p -m 0644 %SOURCE2 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -p -m 0644 %SOURCE2 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
mkdir -p %{buildroot}%{_datadir}/metainfo
install -p -m 0644 %SOURCE3 %{buildroot}%{_datadir}/metainfo
%files
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/dosbox-x.png
%{_datadir}/icons/hicolor/*/apps/dosbox-x.svg
%{_datadir}/metainfo/*
%{_datadir}/dosbox-x

2
make-rpm.sh.in
View File

@ -27,7 +27,7 @@ tar -cvJf "$tar" --exclude=\*.git --exclude=\*.tar.xz --exclude=\*.a --exclude=\
cp -vf "$tar" ~/rpmbuild/SOURCES/ || exit 1
cp -vf contrib/linux/dosbox-x.desktop ~/rpmbuild/SOURCES/ || exit 1
cp -vf contrib/linux/dosbox-x.appdata.xml ~/rpmbuild/SOURCES/ || exit 1
cp -vf src/dosbox.png ~/rpmbuild/SOURCES/dosbox-x.png || exit 1
cp -vf contrib/icons/dosbox-x.svg ~/rpmbuild/SOURCES/ || exit 1
rpmbuild -bb contrib/linux/dosbox-x.spec || exit 1
rm -v "$tar" || exit 1
mv -v ~/rpmbuild/RPMS/$arch/@PACKAGE_NAME@-*@PACKAGE_VERSION@*.rpm "$dir/" || exit 1