[megasync] Correct cmake build.
by Vasiliy Glazov
commit 4b542c95ba8eb59c8e32889a411d0abdab48719e
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Thu Aug 27 10:38:28 2020 +0300
Correct cmake build.
megasync.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/megasync.spec b/megasync.spec
index bf5845b..5dd2c94 100644
--- a/megasync.spec
+++ b/megasync.spec
@@ -1,4 +1,5 @@
%global sdk_version 3.7.1
+%undefine __cmake_in_source_build
%bcond_without dolphin
%bcond_without nautilus
3 years, 8 months
[mendeleydesktop] Add missing epoch to the requires
by Leigh Scott
commit f8fc4e1e563b62b36280558c892c0231c78558bf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 27 08:24:55 2020 +0100
Add missing epoch to the requires
mendeleydesktop.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mendeleydesktop.spec b/mendeleydesktop.spec
index a526b8f..1fc3cf4 100644
--- a/mendeleydesktop.spec
+++ b/mendeleydesktop.spec
@@ -4,7 +4,7 @@
Name: mendeleydesktop
Version: 1.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Academic reference management software for researchers
@@ -86,7 +86,7 @@ Our software, Mendeley Desktop, offers you:
%package -n libreoffice-Mendeley
Summary: Insert citations and generate bibliography from Mendeley
License: ECL 1.0
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: libreoffice-core%{_isa}
%description -n libreoffice-Mendeley
@@ -167,6 +167,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}-libre
%{_metainfodir}/%{name}-libreoffice.metainfo.xml
%changelog
+* Thu Aug 27 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.19.4-2
+- Add missing epoch to the requires
+
* Mon Aug 24 2020 Luya Tshimbalanga <luya_tfz(a)thefinalzone.net> - 1:1.19.4-1
- Revert to 1.19.4 using epoch
3 years, 8 months
[chromium-freeworld] 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, 8 months
[chromium-freeworld] 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, 8 months
[chromium-freeworld] 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, 8 months
[kdenlive] Update kdenlive to 20.08.0
by Sérgio M. Basto
commit 139476d0a6052dd7752853bdfe29d2ba2ef0fe51
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Aug 26 01:03:20 2020 +0100
Update kdenlive to 20.08.0
.gitignore | 1 +
kdenlive.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f98c9c..b676a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/kdenlive-20.04.1.tar.xz
/kdenlive-20.04.2.tar.xz
/kdenlive-20.04.3.tar.xz
+/kdenlive-20.08.0.tar.xz
diff --git a/kdenlive.spec b/kdenlive.spec
index 2cdaf61..7eb5610 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -3,8 +3,8 @@
Name: kdenlive
Summary: Non-linear video editor
-Version: 20.04.3
-Release: 2%{?dist}
+Version: 20.08.0
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -174,6 +174,9 @@ fi
%changelog
+* Tue Aug 25 2020 Sérgio Basto <sergio(a)serjux.com> - 20.08.0-1
+- Update kdenlive to 20.08.0
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 20.04.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 7ec463b..08c47bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kdenlive-20.04.3.tar.xz) = 5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689
+SHA512 (kdenlive-20.08.0.tar.xz) = 46a87cd4ea264b52f6d8a8c87366a9979884cc133615654216641b22f59bfb232145e0c12bb7feaa01076b07c4c5d973c634bcef2c14111ecfa8962c53901d8d
SHA512 (rttr-0.9.6.tar.gz) = 5c94f037b319568d351ee6d25f1404adce00b40598dce4a331789d5357c059e50aae3894f90e60d37307b7e96f4672ae09d3798bbe47f796ef2044f1ac6f9e50
3 years, 8 months
