[chromium-browser-privacy: 7/12] Fix manpage and desktop metadata files
by qvint
commit bdb0bea6e61e0541c64e4116cd275aba47b4853b
Author: qvint <dotqvint(a)gmail.com>
Date: Mon Aug 31 09:22:05 2020 +0300
Fix manpage and desktop metadata files
- Update AppStream metadata
chromium-browser-privacy.appdata.xml | 8 ++++----
chromium-browser-privacy.spec | 8 +++++---
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/chromium-browser-privacy.appdata.xml b/chromium-browser-privacy.appdata.xml
index b83b11f..fd35ec6 100644
--- a/chromium-browser-privacy.appdata.xml
+++ b/chromium-browser-privacy.appdata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>chromium-browser-privacy.desktop</id>
- <update_contact>dotqvint(a)gmail.com</update_contact>
+ <update_contact>chromium-browser-privacy-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-browser-privacy</name>
+ <name>Chromium (CBP)</name>
<summary>Chromium, sans integration with Google</summary>
<description>
<p>
- chromium-browser-privacy is an ungoogled-chromium distribution.
+ chromium-browser-privacy is a distribution of ungoogled-chromium.
</p>
<p>
ungoogled-chromium is Chromium, sans integration with Google. It also
@@ -27,7 +27,7 @@
</description>
<screenshots>
<screenshot type="default">
- <image>https://user-images.githubusercontent.com/16843577/49707064-a0bf6280-fc3a...</image>
+ <image>https://user-images.githubusercontent.com/16843577/91255906-aa6e5e00-e76e...</image>
<caption/>
</screenshot>
</screenshots>
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 2567bae..d906a37 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -3,8 +3,8 @@
%global freeworld 1
# A switch to disable domain substitution for development purposes.
%bcond_without domain_substitution
-%global menu_name Chromium (Freeworld)
-%global xdg_subdir chromium
+%global menu_name Chromium (CBP)
+%global xdg_subdir ungoogled-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)
@@ -232,7 +232,7 @@ Patch500: chromium-default-user-data-dir.patch
Patch600: chromium-widevine-locations.patch
%description
-%{name} is an ungoogled-chromium distribution.
+%{name} is a distribution of ungoogled-chromium.
ungoogled-chromium is Chromium, sans integration with Google. It also features
some tweaks to enhance privacy, control, and transparency (almost all of which
@@ -815,6 +815,8 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
- Update Chromium to 85.0.4183.83
- Update ungoogled-chromium to 76c9694
- Add domain_substitution switch
+- Fix manpage and desktop metadata files
+- Update AppStream metadata
* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update Chromium to 84.0.4147.125
3 years, 7 months
[chromium-browser-privacy: 6/12] Add domain_substitution switch
by qvint
commit 92ba17911eab0eb92e15a80dd96e4adae44fafbf
Author: qvint <dotqvint(a)gmail.com>
Date: Mon Aug 31 09:00:08 2020 +0300
Add domain_substitution switch
chromium-browser-privacy.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index fb4269f..2567bae 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -1,6 +1,8 @@
#Global Libraries
#Do not turn it on in Fedora copr!
%global freeworld 1
+# A switch to disable domain substitution for development purposes.
+%bcond_without domain_substitution
%global menu_name Chromium (Freeworld)
%global xdg_subdir chromium
#This can be any folder on out
@@ -564,11 +566,13 @@ python3 -B %{ungoogled_chromium_root}/utils/patches.py apply . \
%{ungoogled_chromium_root}/patches
# ungoogled-chromium: domain substitution
+%if %{with domain_substitution}
rm -f %{_builddir}/dsc.tar.gz
python3 -B %{ungoogled_chromium_root}/utils/domain_substitution.py apply . \
-r %{ungoogled_chromium_root}/domain_regex.list \
-f %{ungoogled_chromium_root}/domain_substitution.list \
-c %{_builddir}/dsc.tar.gz
+%endif
#####################################BUILD#############################################
%build
@@ -810,6 +814,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
- Update Chromium to 85.0.4183.83
- Update ungoogled-chromium to 76c9694
+- Add domain_substitution switch
* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update Chromium to 84.0.4147.125
3 years, 7 months
[chromium-browser-privacy: 5/12] Update ungoogled-chromium to 76c9694
by qvint
commit 5637229ee8ab83d4867ee54c440e522a76d6e92b
Author: qvint <dotqvint(a)gmail.com>
Date: Mon Aug 31 08:44:57 2020 +0300
Update ungoogled-chromium to 76c9694
chromium-browser-privacy.spec | 5 +++--
chromium-widevine-locations.patch | 4 ++--
sources | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index b07e114..fb4269f 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -85,7 +85,7 @@ Source0: chromium-%{version}-clean.tar.xz
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# ungoogled-chromium.
-%global ungoogled_chromium_revision 84.0.4147.125-1
+%global ungoogled_chromium_revision 76c969401b10e2cbced802e915accb33382f9d0f
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
# The following two source files are copied and modified from the chromium source
@@ -641,7 +641,7 @@ gn_args=(
'google_default_client_id="%{default_client_id}"'
'google_default_client_secret="%{default_client_secret}"'
- closure_compile=false
+ enable_js_type_check=false
enable_mdns=false
enable_mse_mpeg2ts_stream_parser=true
enable_nacl_nonsfi=false
@@ -809,6 +809,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%changelog
* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
- Update Chromium to 85.0.4183.83
+- Update ungoogled-chromium to 76c9694
* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update Chromium to 84.0.4147.125
diff --git a/chromium-widevine-locations.patch b/chromium-widevine-locations.patch
index 5eb5315..9e9acee 100644
--- a/chromium-widevine-locations.patch
+++ b/chromium-widevine-locations.patch
@@ -9,7 +9,7 @@ Source: https://bazaar.launchpad.net/~chromium-team/chromium-browser/disco-dev/v
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
-@@ -379,8 +379,17 @@ bool PathProvider(int key, base::FilePat
+@@ -374,8 +374,17 @@ bool PathProvider(int key, base::FilePat
cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
break;
@@ -28,7 +28,7 @@ Source: https://bazaar.launchpad.net/~chromium-team/chromium-browser/disco-dev/v
if (!GetComponentDirectory(&cur))
return false;
#if !defined(OS_CHROMEOS)
-@@ -389,7 +398,7 @@ bool PathProvider(int key, base::FilePat
+@@ -384,7 +393,7 @@ bool PathProvider(int key, base::FilePat
cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
#endif // !defined(OS_CHROMEOS)
break;
diff --git a/sources b/sources
index fb9656e..6125960 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
-SHA512 (ungoogled-chromium-84.0.4147.125-1.tar.gz) = 6db46f7aefe886a5df1d3872a4cab744c8f567ae6090f0612b42812843ae7a509e146efd9ed99ba237763708a787431d485311e2673eabe87ec64e5bccecdd8a
+SHA512 (ungoogled-chromium-76c969401b10e2cbced802e915accb33382f9d0f.tar.gz) = c2aa4a68787b8c0ed0a6395aba12ddabf6dee1c39aff1bd01a5f894c0ef6c15831f216d4a7c892166d2930c2388c01f2918f2cbee6e77650296429f018c9ea27
3 years, 7 months
[chromium-browser-privacy: 4/12] Sync spec and sources with free/chromium-freeworld
by qvint
commit 38e10aea45b1e9b509a980f740033df7e65d6a26
Merge: 059e9e7 f726697
Author: qvint <dotqvint(a)gmail.com>
Date: Mon Aug 31 08:31:31 2020 +0300
Sync spec and sources with free/chromium-freeworld
.gitignore | 1 -
chromium-84-nss-r771840.patch | 38 -------------
chromium-85-ffmpeg-4.3-r796966.patch | 41 ++++++++++++++
chromium-browser-privacy.spec | 102 ++++++++++++++++++-----------------
chromium-enable-vaapi.patch | 8 +--
chromium-manpage.patch | 34 ++++++++++++
chromium-symbolic.svg | 6 +++
sources | 5 +-
8 files changed, 140 insertions(+), 95 deletions(-)
---
diff --cc .gitignore
index ebe8c14,ae2e382..4bfa600
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,2 +1,3 @@@
chromium-*.tar.xz
chromium-patches-*.tar.gz
- xcb-proto-*.tar.bz2
+ungoogled-chromium-*.tar.gz
diff --cc chromium-browser-privacy.spec
index e2e8294,5ed67f9..b07e114
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -65,12 -55,12 +55,12 @@@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 84.0.4147.125
+ Version: 85.0.4183.83
Release: 1%{?dist}
-Summary: Chromium built with all freeworld codecs and VA-API support
+Summary: Chromium, sans integration with Google
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
+URL: https://github.com/Eloston/ungoogled-chromium
%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
@@@ -91,17 -81,9 +81,13 @@@ Source0: chromium-%{version}-cle
%endif
# Patchset composed by Stephan Hartmann.
- %global patchset_revision chromium-84-patchset-3
+ %global patchset_revision chromium-85-patchset-2
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
- # Bundled xcb-proto. Chromium needs python2 version of this package.
- %global xcb_proto_version 1.13
- Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
-
+# ungoogled-chromium.
+%global ungoogled_chromium_revision 84.0.4147.125-1
+Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
+
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@@ -231,49 -215,38 +218,58 @@@ Patch300: chromium-py2-bootstrap.
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
+# RPM Fusion patches [free/chromium-browser-privacy]:
+Patch500: chromium-default-user-data-dir.patch
+
+# Additional patches:
+Patch600: chromium-widevine-locations.patch
+
%description
-%{name} is an open-source web browser, powered by WebKit (Blink)
+%{name} is an ungoogled-chromium distribution.
+
+ungoogled-chromium is Chromium, sans integration with Google. It also features
+some tweaks to enhance privacy, control, and transparency (almost all of which
+require manual activation or enabling).
+
+ungoogled-chromium retains the default Chromium experience as closely as
+possible. Unlike other Chromium forks that have their own visions of a web
+browser, ungoogled-chromium is essentially a drop-in replacement for Chromium.
############################################PREP###########################################################
%prep
%setup -q -T -n chromium-patches-%{patchset_revision} -b 1
- %setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2
+%setup -q -T -n ungoogled-chromium-%{ungoogled_chromium_revision} -b 300
+ %setup -q -n chromium-%{version}
%global patchset_root %{_builddir}/chromium-patches-%{patchset_revision}
- %global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version}
+%global ungoogled_chromium_root %{_builddir}/ungoogled-chromium-%{ungoogled_chromium_revision}
- %setup -q -n chromium-%{version}
-
# Apply patchset composed by Stephan Hartmann.
- rm %{patchset_root}/chromium-84-compiler.patch
- for patch in %{patchset_root}/*.patch; do
- echo "Applying ${patch}"
- %{__patch} -p1 <"${patch}"
- done
+ %global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1}
+ %patchset_apply chromium-blink-gcc-diagnostic-pragma.patch
+ %patchset_apply chromium-fix-char_traits.patch
+ %patchset_apply chromium-quiche-invalid-offsetof.patch
+ %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
+ %patchset_apply chromium-79-gcc-protobuf-alignas.patch
+ %patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+ %patchset_apply chromium-84-blink-disable-clang-format.patch
+ %patchset_apply chromium-85-DelayNode-cast.patch
+ %patchset_apply chromium-85-FrameWidget-namespace.patch
+ %patchset_apply chromium-85-NearbyConnection-abstract.patch
+ %patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch
+ %patchset_apply chromium-85-oscillator_node-cast.patch
+ %patchset_apply chromium-85-ostream-operator.patch
+ %patchset_apply chromium-85-ozone-include.patch
+ %patchset_apply chromium-85-sim_hash-include.patch
+# ungoogled-chromium: binary pruning.
+python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \
+ %{ungoogled_chromium_root}/pruning.list
+
# Apply patches from this spec.
%autopatch -p1
@@@ -806,34 -763,64 +807,37 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
-- 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
-- Stop using gold
-- Add 'ulimit -n 2048'
++* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
++- Update Chromium to 85.0.4183.83
+
-* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
-- Update to 84.0.4147.89
-- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com>
-- Bundle xcb-proto
-
-* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
-- Update to 83.0.4103.116
-
-* Wed Jun 17 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.106-1
-- Update to 83.0.4103.106
-- Disable python byte compiling
+* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
+- Update Chromium to 84.0.4147.125
+- Update ungoogled-chromium to 84.0.4147.125-1
-* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-2
-- Fix crash in ServiceWorker (rfbz#5671)
+* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
+- Update Chromium to 84.0.4147.89
+- Update ungoogled-chromium to 84.0.4147.89-1
-* Fri Jun 05 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-1
-- Update to 83.0.4103.97
+* Sat Jun 27 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
+- Update Chromium to 83.0.4103.116
+- Update ungoogled-chromium to 83.0.4103.116-1
+- Try alternative locations for the Widevine CDM library
* Wed May 06 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.138-1
-- Update to 81.0.4044.138
-- Fix touchpad scrolling under XWayland (rfbz#5621)
+- Update Chromium to 81.0.4044.138
+- Update ungoogled-chromium to 38e86b5
* Thu Apr 30 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.129-1
-- Update to 81.0.4044.129
-
-* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
-- Update to 81.0.4044.92
+- Update Chromium to 81.0.4044.129
+- Update ungoogled-chromium to 81.0.4044.129-1
-* Sun Apr 05 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.163-1
-- Update to 80.0.3987.163
+* Fri Apr 10 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
+- Update Chromium to 81.0.4044.92
+- Update ungoogled-chromium to 209e24b
-* Thu Apr 02 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.162-1
-- Update to 80.0.3987.162
-
-* Wed Mar 18 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.149-1
-- Update to 80.0.3987.149
-- Fix rpmlint warnings and errors
-
-* Wed Mar 04 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.132-1
-- Update to 80.0.3987.132
-
-* Sun Mar 01 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
-- Update to 80.0.3987.122
+* Thu Feb 27 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
+- Update Chromium to 80.0.3987.122
+- Update ungoogled-chromium to 80.0.3987.122-1
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 79.0.3945.130-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --cc sources
index d29961f,b360cf6..fb9656e
--- a/sources
+++ b/sources
@@@ -1,4 -1,2 +1,3 @@@
- SHA512 (chromium-84.0.4147.125.tar.xz) = a86439efbadce4cc157fe16e0e16732feda2025e14179a54df6a33446f744dc1db59f1ebcf7d5d29d7bfc42102af1283ddf108982152ec1f869d7623af7bed26
- SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
- SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
+ SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
+ SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
+SHA512 (ungoogled-chromium-84.0.4147.125-1.tar.gz) = 6db46f7aefe886a5df1d3872a4cab744c8f567ae6090f0612b42812843ae7a509e146efd9ed99ba237763708a787431d485311e2673eabe87ec64e5bccecdd8a
3 years, 7 months
[chromium-browser-privacy: 3/12] Fix manpage and desktop metadata files
by qvint
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-d4725100-e76b...</image>
<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/+/master/docs/linux_debugg...</url>
+ </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-reporting-guidelines</url>
</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>
3 years, 7 months
[chromium-browser-privacy: 2/12] Drop Fedora 30 support
by qvint
commit 59b831a14f212471194305dacaf02341d16302a5
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Aug 26 04:36:15 2020 +0300
Drop Fedora 30 support
chromium-freeworld.spec | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index f0c0316..2632f94 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -23,11 +23,7 @@
%bcond_without system_ply
%endif
#Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
-%if 0%{?fedora} >= 31
%bcond_without system_harfbuzz
-%else
-%bcond_with system_harfbuzz
-%endif
# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
%bcond_without system_libxml2
@@ -38,7 +34,6 @@
# A patch fix building so enabled by default for Fedora 30
# Need icu version >= 64
%bcond_with system_libicu
-%if 0%{?fedora} >= 31
# Allow testing whether libvpx can be unbundled
%bcond_with system_libvpx
# Allow testing whether ffmpeg can be unbundled
@@ -46,13 +41,6 @@
#Allow minizip to be unbundled
#mini-compat is going to be removed from fedora 30!
%bcond_without system_minizip
-%else
-%bcond_with system_libvpx
-%bcond_with system_ffmpeg
-#Allow minizip to be unbundled
-#mini-compat is going to be removed from fedora 30!
-%bcond_without system_minizip
-%endif
# Need re2 ver. 2016.07.21 for re2::LazyRE2
%bcond_with system_re2
@@ -120,9 +108,7 @@ BuildRequires: mesa-libGL-devel, mesa-libEGL-devel
BuildRequires: minizip-compat-devel
%endif
# Pipewire need this.
-%if 0%{?fedora} >= 29
BuildRequires: pkgconfig(libpipewire-0.2)
-%endif
BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libexif), pkgconfig(nss)
BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver)
@@ -574,9 +560,6 @@ export CXXFLAGS="$CXXFLAGS -w"
export CFLAGS="$CFLAGS -g0"
export CXXFLAGS="$CXXFLAGS -g0"
%endif
-%if 0%{?fedora} <= 29
-export CXXFLAGS="$CXXFLAGS -fno-ipa-cp-clone"
-%endif
#end compiler part
%endif
@@ -642,10 +625,8 @@ gn_args+=(
#Pipewire
gn_args+=(
-%if 0%{?fedora} >= 29
rtc_use_pipewire=true
rtc_link_pipewire=true
-%endif
)
# Ozone stuff : Whole work is done completely upstream.
@@ -767,6 +748,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
- Update to 85.0.4183.83
- Use xcb-proto bundled in Chromium tarball
+- Drop Fedora 30 support
* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update to 84.0.4147.125
3 years, 7 months
[chromium-browser-privacy: 1/12] Update to 85.0.4183.83
by qvint
commit 9dec70d6bc5a6c8125465a5a4890a4cdd387f67c
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Aug 26 03:46:55 2020 +0300
Update to 85.0.4183.83
- Use xcb-proto bundled in Chromium tarball
.gitignore | 1 -
chromium-84-nss-r771840.patch | 38 --------------------------
chromium-85-ffmpeg-4.3-r796966.patch | 41 ++++++++++++++++++++++++++++
chromium-enable-vaapi.patch | 8 +++---
chromium-freeworld.spec | 52 ++++++++++++++++++++----------------
sources | 5 ++--
6 files changed, 76 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d45c0d..ae2e382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
chromium-*.tar.xz
chromium-patches-*.tar.gz
-xcb-proto-*.tar.bz2
diff --git a/chromium-85-ffmpeg-4.3-r796966.patch b/chromium-85-ffmpeg-4.3-r796966.patch
new file mode 100644
index 0000000..5fb9254
--- /dev/null
+++ b/chromium-85-ffmpeg-4.3-r796966.patch
@@ -0,0 +1,41 @@
+From 7f4c7ff6b0f0e74338c885b0d5e5ef80fed597c3 Mon Sep 17 00:00:00 2001
+From: Dan Sanders <sandersd(a)chromium.org>
+Date: Tue, 11 Aug 2020 20:38:03 +0000
+Subject: [PATCH] [media] Set allocation limit compatible with FFmpeg 4.3
+
+Previously we set the limit to zero, meaning no limit, but FFmpeg 4.3
+will not allocate at all with that setting.
+
+Changed to std::numeric_limits<size_t>::max().
+
+Bug: 1095962
+Change-Id: I96820c21f794f2814e955ee75ff22dfd31804c29
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2349405
+Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org>
+Commit-Queue: Dan Sanders <sandersd(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#796966}
+---
+ media/base/media.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/media/base/media.cc
++++ b/media/base/media.cc
+@@ -4,6 +4,9 @@
+
+ #include "media/base/media.h"
+
++#include <stdint.h>
++#include <limits>
++
+ #include "base/allocator/buildflags.h"
+ #include "base/command_line.h"
+ #include "base/macros.h"
+@@ -41,7 +44,7 @@ class MediaInitializer {
+
+ #if BUILDFLAG(USE_ALLOCATOR_SHIM)
+ // Remove allocation limit from ffmpeg, so calls go down to shim layer.
+- av_max_alloc(0);
++ av_max_alloc(std::numeric_limits<size_t>::max());
+ #endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
+
+ #endif // BUILDFLAG(ENABLE_FFMPEG)
diff --git a/chromium-enable-vaapi.patch b/chromium-enable-vaapi.patch
index 5785193..99446a4 100644
--- a/chromium-enable-vaapi.patch
+++ b/chromium-enable-vaapi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enable VAAPI on Linux
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -2367,7 +2367,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2372,7 +2372,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -14,7 +14,7 @@ Subject: [PATCH] Enable VAAPI on Linux
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
{
-@@ -2798,12 +2798,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2823,12 +2823,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -32,7 +32,7 @@ Subject: [PATCH] Enable VAAPI on Linux
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3142,16 +3142,19 @@ const char kMetalDescription[] =
+@@ -3257,16 +3257,19 @@ const char kMetalDescription[] =
#endif
@@ -57,7 +57,7 @@ Subject: [PATCH] Enable VAAPI on Linux
"Use the aggregated ML model to rank the suggested apps.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1823,13 +1823,19 @@ extern const char kMetalDescription[];
+@@ -1881,13 +1881,19 @@ extern const char kMetalDescription[];
#endif // defined(OS_MACOSX)
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index dc129ad..f0c0316 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -66,7 +66,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 84.0.4147.125
+Version: 85.0.4183.83
Release: 1%{?dist}
Summary: Chromium web browser 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)
@@ -91,13 +91,9 @@ Source0: chromium-%{version}-clean.tar.xz
%endif
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-84-patchset-3
+%global patchset_revision chromium-85-patchset-2
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
-# Bundled xcb-proto. Chromium needs python2 version of this package.
-%global xcb_proto_version 1.13
-Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
-
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@ -217,7 +213,9 @@ Recommends: libva-utils
ExclusiveArch: x86_64
# Google patches (short-term fixes and backports):
-Patch150: chromium-84-nss-r771840.patch
+%if 0%{?fedora} >= 33
+Patch150: chromium-85-ffmpeg-4.3-r796966.patch
+%endif
# Gentoo patches (short-term fixes):
@@ -237,19 +235,27 @@ Patch403: chromium-rpm-fusion-brand.patch
############################################PREP###########################################################
%prep
%setup -q -T -n chromium-patches-%{patchset_revision} -b 1
-%setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2
+%setup -q -n chromium-%{version}
%global patchset_root %{_builddir}/chromium-patches-%{patchset_revision}
-%global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version}
-
-%setup -q -n chromium-%{version}
# Apply patchset composed by Stephan Hartmann.
-rm %{patchset_root}/chromium-84-compiler.patch
-for patch in %{patchset_root}/*.patch; do
- echo "Applying ${patch}"
- %{__patch} -p1 <"${patch}"
-done
+%global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1}
+%patchset_apply chromium-blink-gcc-diagnostic-pragma.patch
+%patchset_apply chromium-fix-char_traits.patch
+%patchset_apply chromium-quiche-invalid-offsetof.patch
+%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
+%patchset_apply chromium-79-gcc-protobuf-alignas.patch
+%patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+%patchset_apply chromium-84-blink-disable-clang-format.patch
+%patchset_apply chromium-85-DelayNode-cast.patch
+%patchset_apply chromium-85-FrameWidget-namespace.patch
+%patchset_apply chromium-85-NearbyConnection-abstract.patch
+%patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch
+%patchset_apply chromium-85-oscillator_node-cast.patch
+%patchset_apply chromium-85-ostream-operator.patch
+%patchset_apply chromium-85-ozone-include.patch
+%patchset_apply chromium-85-sim_hash-include.patch
# Apply patches from this spec.
%autopatch -p1
@@ -409,6 +415,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/node \
third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 \
third_party/one_euro_filter \
+ third_party/opencv \
third_party/openh264 \
third_party/openscreen \
third_party/openscreen/src/third_party/mozilla \
@@ -453,7 +460,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/sqlite \
third_party/swiftshader \
third_party/swiftshader/third_party/astc-encoder \
- third_party/swiftshader/third_party/llvm-7.0 \
+ third_party/swiftshader/third_party/llvm-10.0 \
third_party/swiftshader/third_party/llvm-subzero \
third_party/swiftshader/third_party/marl \
third_party/swiftshader/third_party/subzero \
@@ -478,6 +485,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/webrtc/rtc_base/third_party/sigslot \
third_party/widevine \
third_party/woff2 \
+ third_party/xcbproto \
third_party/xdg-utils \
third_party/zlib/google \
tools/grit/third_party/six \
@@ -660,12 +668,6 @@ gn_args+=(
%endif
)
-# Bundled xcb-proto.
-gn_args+=(
- 'xcbproto_path="%{xcb_proto_root}/src"'
-)
-export PYTHONPATH="${PYTHONPATH}${PYTHONPATH+:}%{xcb_proto_root}"
-
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_args[*]}"
%{target}/gn --script-executable=%{__python2} gen --args="${gn_args[*]}" %{target}
%if %{debug_logs}
@@ -762,6 +764,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
+- Update to 85.0.4183.83
+- Use xcb-proto bundled in Chromium tarball
+
* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
- Update to 84.0.4147.125
- Stop using gold
diff --git a/sources b/sources
index 5a53a32..b360cf6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (chromium-84.0.4147.125.tar.xz) = a86439efbadce4cc157fe16e0e16732feda2025e14179a54df6a33446f744dc1db59f1ebcf7d5d29d7bfc42102af1283ddf108982152ec1f869d7623af7bed26
-SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
-SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
+SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
+SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
3 years, 7 months
[chromium-browser-privacy] (12 commits) ...Update ungoogled-chromium to 85.0.4183.102-1
by qvint
Summary of changes:
9dec70d... Update to 85.0.4183.83
59b831a... Drop Fedora 30 support
f726697... Fix manpage and desktop metadata files
38e10ae... Sync spec and sources with free/chromium-freeworld
5637229... Update ungoogled-chromium to 76c9694
92ba179... Add domain_substitution switch
bdb0bea... Fix manpage and desktop metadata files
e0395a6... Ship ANGLE libEGL.so and libGLESv2.so
c2339bf... Update to 85.0.4183.102
7f7c325... Remove bundlepylibs and clang toggles
356e7c7... Sync spec and sources with free/chromium-freeworld
ec6df29... Update ungoogled-chromium to 85.0.4183.102-1
3 years, 7 months
[kodi] rebuilt
by Nicolas Chauvet
Summary of changes:
106cc59... rebuilt (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 7 months
[kodi/f33] rebuilt
by Nicolas Chauvet
commit 106cc59ab07a290b2005219eab871ca0d64d3efe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Sep 13 18:14:09 2020 +0200
rebuilt
kodi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index ea3d01a..d6f48a3 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -42,7 +42,7 @@
Name: kodi
Version: 19.0
-Release: 0.2.20200727gitdb40b2a%{?dist}
+Release: 0.3.20200727gitdb40b2a%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -526,6 +526,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sun Sep 13 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 19.0-0.3.20200727gitdb40b2a
+- rebuilt
+
* Tue Aug 25 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 19.0-0.2.20200727gitdb40b2a
- Update release tag
- Revert java change to workaround glibc issue
3 years, 7 months
