4:57 a.m.
commit f726697afd940e12f9d7795289ecb73f61e17609
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Aug 26 07:25:37 2020 +0300
Fix manpage and desktop metadata files
- Fix XDG paths in manpage
- Update AppStream metadata
- Fix name in .desktop file[1]
- Fix name in GNOME default-apps XML
- Add symbolic app icon
[1] See https://bugzilla.rpmfusion.org/show_bug.cgi?id=5717
chromium-freeworld.appdata.xml | 37 +++++++++++++++++--------------------
chromium-freeworld.spec | 39 +++++++++++++++++++++++++++++++--------
chromium-manpage.patch | 34 ++++++++++++++++++++++++++++++++++
chromium-symbolic.svg | 6 ++++++
4 files changed, 88 insertions(+), 28 deletions(-)
---
diff --git a/chromium-freeworld.appdata.xml b/chromium-freeworld.appdata.xml
index b2543b6..2956915 100644
--- a/chromium-freeworld.appdata.xml
+++ b/chromium-freeworld.appdata.xml
@@ -1,38 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Referenced from
https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#...
-->
<component type="desktop">
<id>chromium-freeworld.desktop</id>
<update_contact>chromium-freeworld-owner(a)rpmfusion.org</update_contact>
<metadata_license>CC0-1.0</metadata_license>
- <project_license>BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and
GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
- <name>Chromium Freeworld</name>
- <summary>Web Browser</summary>
+ <project_license>
+ BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and
+ GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)
+ </project_license>
+ <name>Chromium (Freeworld)</name>
+ <summary>Chromium built with all freeworld codecs and VA-API
support</summary>
<description>
- <p>
- Chromium is an open-source browser project that aims to build a safer, faster,
- and more stable way to experience the web.
- </p>
<p>
- We invite you to join our effort to build a powerful platform for developing a
- new generation of web applications.
+ Chromium is an open-source browser project that aims to build a safer,
+ faster, and more stable way to experience the web.
</p>
<p>
- Chromium supports Vorbis, Theora, WebM and HTML5 audio and video standards, but
- does not include the non-free AAC, H.264, MP3 or Adobe Flash code that is found
- in Chrome.
+ We invite you to join our effort to build a powerful platform for
+ developing a new generation of web applications.
</p>
<p>
- This package comes with all freeworld codecs and vaapi acceleration enabled!
+ This package comes with all freeworld codecs and VA-API support enabled.
</p>
</description>
- <url type="homepage">https://www.chromium.org/Home</url>
<screenshots>
<screenshot type="default">
- <image>https://www.gstatic.com/chrome/appstream/chrome-2.png</image>
+
<image>https://user-images.githubusercontent.com/16843577/91254744-d472...
<caption/>
</screenshot>
- </screenshots>
- <developer_name>Google</developer_name>
- <url type="bugtracker">https://bugzilla.rpmfusion.org</url>
- <url
type="help">https://chromium.googlesource.com/chromium/src/+...
+ </screenshots>
+ <translation/>
+ <developer_name>The Chromium Authors</developer_name>
+ <url type="homepage">https://www.chromium.org/Home</url>
+ <url
type="bugtracker">https://www.chromium.org/for-testers/bug-r...
</component>
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2632f94..5ed67f9 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -1,6 +1,8 @@
#Global Libraries
#Do not turn it on in Fedora copr!
%global freeworld 1
+%global menu_name Chromium (Freeworld)
+%global xdg_subdir chromium
#This can be any folder on out
%global target out/Release
### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -56,7 +58,7 @@
Name: chromium-freeworld
Version: 85.0.4183.83
Release: 1%{?dist}
-Summary: Chromium web browser built with all freeworld codecs and VA-API support
+Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and
OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
@@ -86,6 +88,7 @@ Source1:
https://github.com/stha09/chromium-patches/archive/%{patchset_re
Source10: %{name}.sh
#Add our own appdata file.
Source11: %{name}.appdata.xml
+Source12: chromium-symbolic.svg
#Personal stuff
Source15: LICENSE
######################## Installation Folder
#################################################
@@ -212,8 +215,9 @@ Patch300: chromium-py2-bootstrap.patch
Patch400: chromium-enable-vaapi.patch
Patch401: chromium-fix-vaapi-on-intel.patch
Patch402: chromium-enable-widevine.patch
+Patch403: chromium-manpage.patch
%if %{freeworld}
-Patch403: chromium-rpm-fusion-brand.patch
+Patch420: chromium-rpm-fusion-brand.patch
%endif
%description
@@ -666,17 +670,28 @@ mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_metainfodir}
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
sed -e "s|@@CHROMIUMDIR@@|%{chromiumdir}|" %{SOURCE10} > %{name}.sh
install -m 755 %{name}.sh %{buildroot}%{_bindir}/%{name}
install -m 644 %{SOURCE11} %{buildroot}%{_metainfodir}
-sed -e "s|@@MENUNAME@@|%{name}|g" -e "s|@@PACKAGE@@|%{name}|g" \
- chrome/app/resources/manpage.1.in > chrome.1
+sed \
+ -e "s|@@MENUNAME@@|Chromium|g" \
+ -e "s|@@PACKAGE@@|%{name}|g" \
+ -e "s|@@SUMMARY@@|%{summary}|g" \
+ -e "s|@@XDG_SUBDIR@@|%{xdg_subdir}|g" \
+ chrome/app/resources/manpage.1.in >chrome.1
install -m 644 chrome.1 %{buildroot}%{_mandir}/man1/%{name}.1
-sed -e "s|@@MENUNAME@@|%{name}|g" -e "s|@@PACKAGE@@|%{name}|g" -e
"s|@@USR_BIN_SYMLINK_NAME@@|%{name}|g" \
- chrome/installer/linux/common/desktop.template > %{name}.desktop
+sed \
+ -e "s|@@MENUNAME@@|%{menu_name}|g" \
+ -e "s|@@PACKAGE@@|%{name}|g" \
+ -e "s|@@USR_BIN_SYMLINK_NAME@@|%{name}|g" \
+ chrome/installer/linux/common/desktop.template >%{name}.desktop
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
-sed -e "s|@@MENUNAME@@|%{name}|g" -e "s|@@PACKAGE@@|%{name}|g" -e
"s|@@INSTALLDIR@@|%{_bindir}|g" \
-chrome/installer/linux/common/default-app.template > %{name}.xml
+sed \
+ -e "s|@@INSTALLDIR@@|%{_bindir}|g" \
+ -e "s|@@MENUNAME@@|%{menu_name}|g" \
+ -e "s|@@PACKAGE@@|%{name}|g" \
+ chrome/installer/linux/common/default-app.template >%{name}.xml
install -m 644 %{name}.xml %{buildroot}%{_datadir}/gnome-control-center/default-apps/
install -m 755 %{target}/chrome %{buildroot}%{chromiumdir}/%{name}
install -m 4755 %{target}/chrome_sandbox %{buildroot}%{chromiumdir}/chrome-sandbox
@@ -704,6 +719,8 @@ for i in 24 32 48 64 128 256; do
install -m 644 chrome/app/theme/chromium/${dir}product_logo_$i.${ext} \
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.${ext}
done
+install -m 644 %{SOURCE12} \
+ %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/%{name}-symbolic.svg
####################################check##################################################
%check
appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appdata.xml"
@@ -723,6 +740,7 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/symbolic/apps/%{name}-symbolic.svg
%{_mandir}/man1/%{name}.1.gz
%dir %{chromiumdir}
%{chromiumdir}/%{name}
@@ -749,6 +767,11 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
- Update to 85.0.4183.83
- Use xcb-proto bundled in Chromium tarball
- Drop Fedora 30 support
+- Fix XDG paths in manpage
+- Update AppStream metadata
+- Fix name in .desktop file (rfbz#5717)
+- Fix name in GNOME default-apps XML
+- Add symbolic app icon
* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update to 84.0.4147.125
diff --git a/chromium-manpage.patch b/chromium-manpage.patch
new file mode 100644
index 0000000..800bed3
--- /dev/null
+++ b/chromium-manpage.patch
@@ -0,0 +1,34 @@
+--- a/chrome/app/resources/manpage.1.in
++++ b/chrome/app/resources/manpage.1.in
+@@ -3,7 +3,7 @@
+ .TH @@PACKAGE@@ 1 "" "" "USER COMMANDS"
+
+ .SH NAME
+-@@PACKAGE@@ \- the web browser from Google
++@@PACKAGE@@ \- @@SUMMARY@@
+
+ .SH SYNOPSIS
+ .B @@PACKAGE@@
+@@ -24,7 +24,7 @@ stable flags.
+ \fB\-\-user\-data\-dir\fR=\fIDIR\fR
+ Specifies the directory that user data (your "profile") is kept in.
+ Defaults to
+-.I $HOME/.config/@@PACKAGE@@ .
++.I $HOME/.config/@@XDG_SUBDIR@@ .
+ Separate instances of @@MENUNAME@@ must use separate user data directories;
+ repeated invocations of @@PACKAGE@@ will reuse an existing process for
+ a given user data directory.
+@@ -150,11 +150,11 @@ Comma separated list of hosts or pattern
+
+ .SH FILES
+ .TP
+-.I $HOME/.config/@@PACKAGE@@
++.I $HOME/.config/@@XDG_SUBDIR@@
+ Default directory for configuration data.
+
+ .TP
+-.I $HOME/.cache/@@PACKAGE@@
++.I $HOME/.cache/@@XDG_SUBDIR@@
+ Default directory for cache data. (Why? See
+ <http://standards.freedesktop.org/basedir-spec/latest/> .)
+
diff --git a/chromium-symbolic.svg b/chromium-symbolic.svg
new file mode 100644
index 0000000..14a8be0
--- /dev/null
+++ b/chromium-symbolic.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16"
height="16">
+ <g fill="#bebebe">
+ <path d="M8 0a8 8 0 00-6.3066406 3.078125l2.3867187 4.1308594A4 4 0 018
4h6.929688A8 8 0 008 0zM1.0703125 4A8 8 0 000 8a8 8 0 006.8886719
7.921875l2.3847656-4.130859A4 4 0 018 12a4 4 0 01-3.4648438-2 4 4 0
01-.0078124-.0136719L1.0703125 4zm9.5742185 1A4 4 0 0112 8a4 4 0 01-.535156 2L8 16a8 8 0
008-8 8 8 0 00-.585938-3h-4.769531z"/>
+ <circle r="3" cy="8" cx="8"/>
+ </g>
+</svg>
