[ffmpegthumbs] Add unpackaged file
by Leigh Scott
commit 6deb728994c48736cc166c73134a47b73f017928
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Sep 17 08:16:54 2018 +0100
Add unpackaged file
ffmpegthumbs.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpegthumbs.spec b/ffmpegthumbs.spec
index 4ed905f..2f6034a 100644
--- a/ffmpegthumbs.spec
+++ b/ffmpegthumbs.spec
@@ -51,6 +51,7 @@ make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%license COPYING
%{_kf5_qtplugindir}/ffmpegthumbs.so
%{_kf5_datadir}/kservices5/ffmpegthumbs.desktop
+%{_kf5_datadir}/config.kcfg/ffmpegthumbnailersettings5.kcfg
%changelog
* Mon Sep 17 2018 Sérgio Basto <sergio(a)serjux.com> - 18.08.1-1
6 years
[ffmpegthumbs] Add BuildRequires: cmake(KF5I18n)
by Leigh Scott
commit 38efd30d8c7404660fa2956671c11a5040feaf8f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Sep 17 08:07:51 2018 +0100
Add BuildRequires: cmake(KF5I18n)
ffmpegthumbs.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/ffmpegthumbs.spec b/ffmpegthumbs.spec
index d600c75..4ed905f 100644
--- a/ffmpegthumbs.spec
+++ b/ffmpegthumbs.spec
@@ -14,12 +14,9 @@ URL: https://projects.kde.org/projects/kde/kdemultimedia/%{name}
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{v...
BuildRequires: extra-cmake-modules
-%if 0%{?fedora} > 23
BuildRequires: pkgconfig(libjpeg)
-%else
-BuildRequires: libjpeg-devel
-%endif
BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5I18n)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
6 years
[k3b-extras-freeworld] Update k3b-extras-freeworld to 18.08.1
by Sérgio M. Basto
commit 950a7d8787e7ed505a1298adbd603aa45e182d9a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 17 03:36:49 2018 +0100
Update k3b-extras-freeworld to 18.08.1
.gitignore | 1 +
k3b-extras-freeworld.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 965c86d..84fd6ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ k3b-2.0.3.tar.xz
/k3b-17.08.3.tar.xz
/k3b-17.12.2.tar.xz
/k3b-18.04.3.tar.xz
+/k3b-18.08.1.tar.xz
diff --git a/k3b-extras-freeworld.spec b/k3b-extras-freeworld.spec
index 1eb37d1..b8a71da 100644
--- a/k3b-extras-freeworld.spec
+++ b/k3b-extras-freeworld.spec
@@ -1,8 +1,8 @@
Name: k3b-extras-freeworld
Summary: Provides ffmpeg decoder plugin for the k3b CD/DVD burning application
Epoch: 1
-Version: 18.04.3
-Release: 2%{?dist}
+Version: 18.08.1
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.k3b.org/
@@ -78,6 +78,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ff
%changelog
+* Mon Sep 17 2018 Sérgio Basto <sergio(a)serjux.com> - 1:18.08.1-1
+- Update k3b-extras-freeworld to 18.08.1
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:18.04.3-2
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
diff --git a/sources b/sources
index 2d68e24..67273df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-909597d1ece81f6f50f055e5c0712e01 k3b-18.04.3.tar.xz
+33718ebf5fbc585d90e0a23a1cc1678f k3b-18.08.1.tar.xz
6 years
[kdenlive] Update kdenlive to 18.08.1
by Sérgio M. Basto
commit c2438b3f240e8acdca4570bff3c5afc59c7002b5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 17 03:35:20 2018 +0100
Update kdenlive to 18.08.1
.gitignore | 1 +
kdenlive.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eff57bb..76a2278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/kdenlive-17.12.3.tar.xz
/kdenlive-18.04.1.tar.xz
/kdenlive-18.04.3.tar.xz
+/kdenlive-18.08.1.tar.xz
diff --git a/kdenlive.spec b/kdenlive.spec
index e8116a7..d30eb80 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,8 +1,8 @@
Name: kdenlive
Summary: Non-linear video editor
-Version: 18.04.3
-Release: 2%{?dist}
+Version: 18.08.1
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -152,6 +152,9 @@ fi
%changelog
+* Mon Sep 17 2018 Sérgio Basto <sergio(a)serjux.com> - 18.08.1-1
+- Update kdenlive to 18.08.1
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 18.04.3-2
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
diff --git a/sources b/sources
index d5428c2..d1c11a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c21031efe09f70791fcb42b7b3d5cfed kdenlive-18.04.3.tar.xz
+e1038f07652a06b88ab2040cb7dc3e39 kdenlive-18.08.1.tar.xz
6 years
[ffmpegthumbs] Update ffmpegthumbs to 18.08.1
by Sérgio M. Basto
commit 0b1e4d62a3598061a804fe34e3c7ca1ac7b33dc2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 17 03:29:13 2018 +0100
Update ffmpegthumbs to 18.08.1
.gitignore | 1 +
ffmpegthumbs.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2065d38..c2a4614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ ffmpegthumbs-4.13.97.tar.xz
/ffmpegthumbs-17.04.2.tar.xz
/ffmpegthumbs-17.08.1.tar.xz
/ffmpegthumbs-17.12.0.tar.xz
+/ffmpegthumbs-18.08.1.tar.xz
diff --git a/ffmpegthumbs.spec b/ffmpegthumbs.spec
index 6319f6d..d600c75 100644
--- a/ffmpegthumbs.spec
+++ b/ffmpegthumbs.spec
@@ -1,6 +1,6 @@
Name: ffmpegthumbs
-Version: 17.12.0
-Release: 5%{?dist}
+Version: 18.08.1
+Release: 1%{?dist}
Summary: KDE ffmpegthumbnailer service
License: GPLv2+
@@ -56,6 +56,9 @@ make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%{_kf5_datadir}/kservices5/ffmpegthumbs.desktop
%changelog
+* Mon Sep 17 2018 Sérgio Basto <sergio(a)serjux.com> - 18.08.1-1
+- Update ffmpegthumbs to 18.08.1
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 17.12.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 914792e..c584ac1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c85849a6c315fac195b77ac14c1079 ffmpegthumbs-17.12.0.tar.xz
+b18096ca9bdc500e30c13056e3389be7 ffmpegthumbs-18.08.1.tar.xz
6 years
[chromium-freeworld: 2/2] Merge Fedora, chromium-69.0.3497.92-1
by Miro Hrončok
commit 5a4c348b3f943059ff3be7c2f65c70b45ef59e1f
Merge: e33ff31 0fc6cb9
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sun Sep 16 10:43:32 2018 +0200
Merge Fedora, chromium-69.0.3497.92-1
.gitignore | 1 +
chromium-69.0.3497.81-build-sanely-please.patch | 33 ++++++++++
chromium-69.0.3497.81-gcc8-alignof.patch | 18 +++++
chromium-69.0.3497.81-norar.patch | 79 ++++++++++++++++++++++
chromium-69.0.3497.81-py2-bootstrap.patch | 33 ++++++++++
chromium-69.0.3497.81-widevine-r2.patch | 23 +++++++
chromium-freeworld.spec | 88 ++++++++++++++-----------
sources | 2 +-
8 files changed, 237 insertions(+), 40 deletions(-)
---
diff --cc .gitignore
index 0f8acf8,7bca843..90a5fd5
--- a/.gitignore
+++ b/.gitignore
@@@ -57,9 -62,9 +57,10 @@@
/Tinos-Bold.ttf
/Tinos-Italic.ttf
/Tinos-Regular.ttf
-/chromium-67.0.3396.79-clean.tar.xz
-/chromium-67.0.3396.87-clean.tar.xz
-/chromium-67.0.3396.99-clean.tar.xz
-/chromium-68.0.3440.106-clean.tar.xz
+/chromium-67.0.3396.62.tar.xz
+/chromium-67.0.3396.79.tar.xz
+/chromium-67.0.3396.87.tar.xz
+/chromium-67.0.3396.99.tar.xz
/Ahem.ttf
-/chromium-69.0.3497.92-clean.tar.xz
+/chromium-68.0.3440.106.tar.xz
++/chromium-69.0.3497.92.tar.xz
diff --cc sources
index d1fe7b1,19cd551..007b2a2
--- a/sources
+++ b/sources
@@@ -1,19 -1,20 +1,19 @@@
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
-SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
-SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
-SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) = 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
-SHA512 (Arimo-BoldItalic.ttf) = cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4
-SHA512 (Arimo-Bold.ttf) = 2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41
-SHA512 (Arimo-Italic.ttf) = 56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5
-SHA512 (Arimo-Regular.ttf) = 05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f
-SHA512 (Cousine-BoldItalic.ttf) = 2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918
-SHA512 (Cousine-Bold.ttf) = 1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab
-SHA512 (Cousine-Italic.ttf) = ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700
-SHA512 (Cousine-Regular.ttf) = a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0
-SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd
-SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
-SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
-SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
-SHA512 (chromium-68.0.3440.106-clean.tar.xz) = a609975c96674f3a84a33bb3d57271535671e11d0775efeceff4f8a965851216038cf491281aaab0cc64c6e99af033f9c8a93f759f232e8c686408dbc09c8dd5
-SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
-SHA512 (chromium-69.0.3497.92-clean.tar.xz) = 8cba541684ba3539e888c76e00a27c0f4cbcce9164544768a840002b8c44727d6f0596e288170989331d7693b510ec26cb6fb4b68e530339dfb0685cc9ed4fd8
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
+4d610887ff4d445cbc639aae7828d139 gelasio.zip
+314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
+9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip
+85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz
+08fb930e5cf38bab811efa91f368b248 Arimo-BoldItalic.ttf
+927b7dca5b947f69cb8e835f7f743d15 Arimo-Bold.ttf
+fa87472a877e70c5bce22e42be5c25a9 Arimo-Italic.ttf
+7ac02a544211773d9636e056e9da6c35 Arimo-Regular.ttf
+97415fecbce8ffd540f9f9af681cd398 Cousine-BoldItalic.ttf
+86fed5639322e2f033ad817ee406c2fe Cousine-Bold.ttf
+cef49e5506d6f09ea3064f7bd3191417 Cousine-Italic.ttf
+00d46771d6344fd0c8e3d05bfd092887 Cousine-Regular.ttf
+042b1967a334625c34b3ab6255242127 Tinos-BoldItalic.ttf
+b68a7149509c5f1f69153d2dc3d8dd17 Tinos-Bold.ttf
+0da96c8a7d54f8b8f6f7713c8524f2fc Tinos-Italic.ttf
+b25c0f936b23cccc0b92e85017e02bee Tinos-Regular.ttf
+da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
- 45f1c943546c008051ec39df51aa20c0 chromium-68.0.3440.106.tar.xz
++4d4cc84d0b166d4dbc56f1d80e41de8a chromium-69.0.3497.92.tar.xz
6 years
[chromium-freeworld: 1/2] 69.0.3497.92
by Miro Hrončok
commit 0fc6cb9e41deeb2d0a941b7bf79649873aa2527a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Sep 14 08:04:34 2018 -0400
69.0.3497.92
.gitignore | 1 +
chromium-69.0.3497.81-build-sanely-please.patch | 33 ++++++++++
chromium-69.0.3497.81-gcc8-alignof.patch | 18 +++++
chromium-69.0.3497.81-norar.patch | 79 ++++++++++++++++++++++
chromium-69.0.3497.81-py2-bootstrap.patch | 33 ++++++++++
chromium-69.0.3497.81-widevine-r2.patch | 23 +++++++
chromium.spec | 88 ++++++++++++++-----------
sources | 1 +
8 files changed, 237 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da9b487..7bca843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
/chromium-67.0.3396.99-clean.tar.xz
/chromium-68.0.3440.106-clean.tar.xz
/Ahem.ttf
+/chromium-69.0.3497.92-clean.tar.xz
diff --git a/chromium-69.0.3497.81-build-sanely-please.patch b/chromium-69.0.3497.81-build-sanely-please.patch
new file mode 100644
index 0000000..6241a97
--- /dev/null
+++ b/chromium-69.0.3497.81-build-sanely-please.patch
@@ -0,0 +1,33 @@
+diff -up chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot chromium-69.0.3497.81/build/config/BUILD.gn
+--- chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot 2018-09-06 13:43:44.863375238 -0400
++++ chromium-69.0.3497.81/build/config/BUILD.gn 2018-09-06 13:43:58.377083290 -0400
+@@ -284,9 +284,9 @@ group("executable_and_loadable_module_an
+ public_deps += [ "//build/config/sanitizers:deps" ]
+ }
+
+- if (use_custom_libcxx) {
+- public_deps += [ "//buildtools/third_party/libc++" ]
+- }
++ # if (use_custom_libcxx) {
++ # public_deps += [ "//buildtools/third_party/libc++" ]
++ # }
+
+ if (use_afl) {
+ public_deps += [ "//third_party/afl" ]
+diff -up chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot chromium-69.0.3497.81/build/config/sysroot.gni
+--- chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot 2018-09-06 13:40:46.212232232 -0400
++++ chromium-69.0.3497.81/build/config/sysroot.gni 2018-09-06 13:41:02.421882529 -0400
+@@ -15,9 +15,10 @@ declare_args() {
+ # The absolute path to directory containing linux sysroot images
+ target_sysroot_dir = "//build/linux"
+
+- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
+- current_cpu == "arm" || current_cpu == "arm64" ||
+- current_cpu == "mipsel" || current_cpu == "mips64el"
++ use_sysroot = false
++ # use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
++ # current_cpu == "arm" || current_cpu == "arm64" ||
++ # current_cpu == "mipsel" || current_cpu == "mips64el"
+ }
+
+ if (current_os == target_os && current_cpu == target_cpu &&
diff --git a/chromium-69.0.3497.81-gcc8-alignof.patch b/chromium-69.0.3497.81-gcc8-alignof.patch
new file mode 100644
index 0000000..234b391
--- /dev/null
+++ b/chromium-69.0.3497.81-gcc8-alignof.patch
@@ -0,0 +1,18 @@
+diff -up chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof chromium-69.0.3497.81/mojo/public/c/system/macros.h
+--- chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof 2018-09-06 10:11:54.336432699 -0400
++++ chromium-69.0.3497.81/mojo/public/c/system/macros.h 2018-09-06 10:13:56.555727572 -0400
+@@ -27,7 +27,13 @@
+ (sizeof(void*) == 4 ? 32 : 0)
+
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
diff --git a/chromium-69.0.3497.81-norar.patch b/chromium-69.0.3497.81-norar.patch
new file mode 100644
index 0000000..9545b60
--- /dev/null
+++ b/chromium-69.0.3497.81-norar.patch
@@ -0,0 +1,79 @@
+diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn
+--- chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar 2018-09-06 13:29:47.114511569 -0400
++++ chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn 2018-09-06 13:29:47.120511452 -0400
+@@ -55,40 +55,6 @@ if (safe_browsing_mode == 1) {
+ "//components/safe_browsing:csd_proto",
+ ]
+ }
+-
+- source_set("rar_analyzer") {
+- sources = [
+- "rar_analyzer.cc",
+- "rar_analyzer.h",
+- ]
+-
+- deps = [
+- ":archive_analyzer_results",
+- ":download_protection_util",
+- ":file_type_policies",
+- "//base",
+- "//base:i18n",
+- "//third_party/unrar:unrar",
+- ]
+-
+- defines = [
+- "_FILE_OFFSET_BITS=64",
+- "LARGEFILE_SOURCE",
+- "RAR_SMP",
+- "SILENT",
+-
+- # The following is set to disable certain macro definitions in the unrar
+- # source code.
+- "CHROMIUM_UNRAR",
+-
+- # Disables exceptions in unrar, replaces them with process termination.
+- "UNRAR_NO_EXCEPTIONS",
+- ]
+-
+- public_deps = [
+- "//components/safe_browsing:csd_proto",
+- ]
+- }
+ }
+
+ source_set("safe_browsing") {
+@@ -121,7 +87,6 @@ source_set("safe_browsing") {
+ deps += [
+ ":archive_analyzer_results",
+ ":download_protection_util",
+- ":rar_analyzer",
+ "//components/safe_browsing:features",
+ ]
+
+diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS
+--- chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar 2018-09-06 13:29:47.119511472 -0400
++++ chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS 2018-09-06 13:29:47.116511530 -0400
+@@ -1,6 +1,5 @@
+ include_rules = [
+ "+components/safe_browsing",
+ "+third_party/protobuf",
+- "+third_party/unrar",
+ "+third_party/zlib",
+ ]
+diff -up chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2018-09-07 10:10:42.286041744 -0400
++++ chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc 2018-09-07 10:11:14.934308285 -0400
+@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
+
+ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+ AnalyzeRarFileCallback callback) {
++#if 0
+ DCHECK(rar_file.IsValid());
+
+ safe_browsing::ArchiveAnalyzerResults results;
+ safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results);
+ std::move(callback).Run(results);
++#else
++ NOTREACHED();
++#endif
+ }
diff --git a/chromium-69.0.3497.81-py2-bootstrap.patch b/chromium-69.0.3497.81-py2-bootstrap.patch
new file mode 100644
index 0000000..8a5db71
--- /dev/null
+++ b/chromium-69.0.3497.81-py2-bootstrap.patch
@@ -0,0 +1,33 @@
+diff -up chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+--- chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-09-06 10:45:17.919774145 -0400
++++ chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-09-06 10:45:17.914774254 -0400
+@@ -58,7 +58,7 @@ def _MinifyJS(input_js):
+
+ with tempfile.NamedTemporaryFile() as _:
+ args = [
+- 'python',
++ 'python2',
+ rjsmin_path
+ ]
+ p = subprocess.Popen(args,
+@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
+ os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
+
+ with tempfile.NamedTemporaryFile() as _:
+- rcssmin_args = ['python', rcssmin_path]
++ rcssmin_args = ['python2', rcssmin_path]
+ p = subprocess.Popen(rcssmin_args,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+diff -up chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py
+--- chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 2018-09-06 10:44:42.225550561 -0400
++++ chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py 2018-09-06 13:06:24.251636231 -0400
+@@ -87,7 +87,7 @@ def main(argv):
+ if not options.debug:
+ gn_gen_args += ' is_debug=false'
+ subprocess.check_call([
+- gn_path, 'gen', out_dir,
++ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2',
+ '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
+ ])
+
diff --git a/chromium-69.0.3497.81-widevine-r2.patch b/chromium-69.0.3497.81-widevine-r2.patch
new file mode 100644
index 0000000..a66a0fb
--- /dev/null
+++ b/chromium-69.0.3497.81-widevine-r2.patch
@@ -0,0 +1,23 @@
+diff -up chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn.wvhack chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn
+--- chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn.wvhack 2018-09-06 13:28:22.655272555 -0400
++++ chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn 2018-09-06 13:28:22.655272555 -0400
+@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
+ # Internal Cast builds set enable_widevine=true to bring in Widevine support.
+ # TODO(xhwang): Support component updated CDM on other platforms and remove this
+ # assert.
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
++assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
+ "Component updated CDM only supported on Windows and Mac for now.")
+
+ widevine_arch = current_cpu
+diff -up chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h.wvhack chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h
+--- chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h.wvhack 2018-09-06 13:28:22.654272577 -0400
++++ chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-09-06 13:28:22.654272577 -0400
+@@ -10,6 +10,7 @@
+
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ #define WIDEVINE_CDM_AVAILABLE
+
+ #endif // WIDEVINE_CDM_VERSION_H_
diff --git a/chromium.spec b/chromium.spec
index 45cacb5..19c30b5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -29,11 +29,16 @@
# We don't want any libs in these directories to generate Provides
# Requires is trickier.
+# To generate this list, go into %%{buildroot}%%{chromium_path} and run
+# for i in `find . -name "*.so"`; do NAME=`basename -s .so $i`; printf "$NAME|"; done
+# for RHEL7, append libfontconfig to the end
+# make sure there is not a trailing | at the end of the list
+
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*
%if 0%{?rhel} == 7
-%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_b
link|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_dev
ices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_cpp_platform|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_se
rvices|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_d
ialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2|libfontconfig|libzygote
+%global privlibs libEGL|libGLESv2|libEGL|libGLESv2|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libanimation|libapdu|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libbindings_base|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_core_mojo_bindings_shared|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libconten
t_service_cpp|libcontent_service_mojom|libcontent_service_mojom_shared|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevice_vr|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libembedder_switches|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_shared_typemap_traits|libgcm|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2|libgles2_implementation|libgles2_utils
|libgpu|libgpu_ipc_service|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmojo_base_lib|libmojo_base_mojom|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_shared_typemap_traits|libmojo_core_embedder|libmojo_core_embedder_internal|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojo_mojom_bindings|libmojo_mojom_bindings_shared|libmojo_public_system|libmojo_public_system_cpp|libmojom_core_shared|libmojom_platform_shared|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp|libnetwork_cpp_base|libnetwork_service|libnetwork_session_configurator|libonc|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_sha
red|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp|libresource_coordinator_cpp_base|libresource_coordinator_public_mojom|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libsandbox|libsandbox_services|libseccomp_bpf|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libtracing_cpp|libtracing_mojom|libtracing_mojom_shared|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|liburl|libui_views_mus_lib|liburl_ipc|li
burl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format|libvr_common|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libweb_dialogs|libwebdata_common|libwebview|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window|libzygote|libfontconfig
%else
-%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_b
link|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_dev
ices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_cpp_platform|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_se
rvices|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_d
ialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2|libzygote
+%global privlibs libEGL|libGLESv2|libEGL|libGLESv2|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libanimation|libapdu|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libbindings_base|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_core_mojo_bindings_shared|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libconten
t_service_cpp|libcontent_service_mojom|libcontent_service_mojom_shared|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevice_vr|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libembedder_switches|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_shared_typemap_traits|libgcm|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2|libgles2_implementation|libgles2_utils
|libgpu|libgpu_ipc_service|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmojo_base_lib|libmojo_base_mojom|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_shared_typemap_traits|libmojo_core_embedder|libmojo_core_embedder_internal|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojo_mojom_bindings|libmojo_mojom_bindings_shared|libmojo_public_system|libmojo_public_system_cpp|libmojom_core_shared|libmojom_platform_shared|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp|libnetwork_cpp_base|libnetwork_service|libnetwork_session_configurator|libonc|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_sha
red|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp|libresource_coordinator_cpp_base|libresource_coordinator_public_mojom|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libsandbox|libsandbox_services|libseccomp_bpf|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libtracing_cpp|libtracing_mojom|libtracing_mojom_shared|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|liburl|libui_views_mus_lib|liburl_ipc|li
burl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format|libvr_common|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libweb_dialogs|libwebdata_common|libwebview|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window|libzygote
%endif
%global __requires_exclude ^(%{privlibs})\\.so*
@@ -132,15 +137,15 @@ BuildRequires: libicu-devel >= 5.4
%global chromoting_client_id %nil
%endif
-%global majorversion 68
+%global majorversion 69
%if %{freeworld}
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3440.106
-Release: 4%{?dist}
+Version: %{majorversion}.0.3497.92
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -175,7 +180,7 @@ Patch19: chromium-52.0.2743.116-unset-madv_free.patch
Patch20: chromium-67.0.3396.62-gn-system.patch
# Fix last commit position issue
# https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4
-Patch21: chromium-60.0.3112.78-last-commit-position.patch
+# Patch21: chromium-60.0.3112.78-last-commit-position.patch
# Fix issue where timespec is not defined when sys/stat.h is included.
Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch
# I wouldn't have to do this if there was a standard way to append extra compiler flags
@@ -239,7 +244,7 @@ Patch88: chromium-66.0.3359.117-missing-files.patch
# https://bugs.chromium.org/p/chromium/issues/detail?id=816952
# Patch91: chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch
# Do not use unrar code, it is non-free
-Patch92: chromium-66.0.3359.117-nounrar.patch
+Patch92: chromium-69.0.3497.81-norar.patch
# Upstream GCC fixes
Patch93: chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch
Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
@@ -251,9 +256,7 @@ Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.pa
# GCC8 has changed the alignof operator to return the minimal alignment required by the target ABI
# instead of the preferred alignment. This means int64_t is now 4 on i686 (instead of 8).
# Use __alignof__ to get the value we expect (and chromium checks for).
-Patch98: chromium-66.0.3359.170-gcc8-alignof.patch
-# https://chromium.googlesource.com/crashpad/crashpad/+/26ef5c910fc7e2edb44...
-Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
+Patch98: chromium-69.0.3497.81-gcc8-alignof.patch
# RHEL 7 has a bug in its python2.7 which does not propely handle exec with a tuple
# https://bugs.python.org/issue21591
Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
@@ -261,25 +264,22 @@ Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
Patch101: chromium-68.0.3440.106-fedora-user-agent.patch
# Try to fix version.py for Rawhide
Patch102: chromium-67.0.3396.99-py3fix.patch
-Patch103: chromium-67.0.3396.99-py2-bootstrap.patch
-# ERROR at //extensions/browser/api/networking_private/BUILD.gn:15:5: Undefined identifier
-# "networking_cast_private_delegate.cc",
-# ^------------------------------------
-# https://chromium.googlesource.com/chromium/src/+/abde0a4bd9f3bfddebe825cc...
-Patch104: chromium-68.0.3440.106-fix-build-networking_private.patch
-# CORS legacy: add missing string include
-Patch105: chromium-68.0.3440.84-cors-string.patch
-# Fix libjpeg include handling
-Patch106: chromium-68.0.3440.84-libjpeg.patch
-# Fix webp bundling shim
-Patch107: chromium-68.0.3440.84-libwebp-shim.patch
+Patch103: chromium-69.0.3497.81-py2-bootstrap.patch
# GCC: do not std::move unique ptr of forward declared UrlIndex
-Patch108: chromium-68.0.3440.84-move-unique-ptr.patch
+# Patch108: chromium-68.0.3440.84-move-unique-ptr.patch
# https://github.com/OSSystems/meta-browser/blob/master/recipes-browser/chr...
Patch109: 0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch
# Fix default on redeclaration error
# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c...
Patch110: chromium-68.0.3440.106-fix-default-on-redeclaration.patch
+# Use Gentoo's Widevine hack
+# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
+Patch111: chromium-69.0.3497.81-widevine-r2.patch
+# Do not require sysroot
+# Forget about trying to make libc++
+# BUILD SANELY PLEASE
+Patch112: chromium-69.0.3497.81-build-sanely-please.patch
+
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -359,8 +359,8 @@ BuildRequires: pulseaudio-libs-devel
# for /usr/bin/appstream-util
BuildRequires: libappstream-glib
-# Fedora turns on NaCl
-# NaCl needs these
+# gn needs these
+BuildRequires: libstdc++-static
BuildRequires: libstdc++-devel, openssl-devel
%if 0%{?nacl}
BuildRequires: nacl-gcc, nacl-binutils, nacl-newlib
@@ -759,7 +759,7 @@ udev.
%patch18 -p1 -b .etc
# %%patch19 -p1 -b .madv_free
%patch20 -p1 -b .gnsystem
-%patch21 -p1 -b .lastcommit
+# %%patch21 -p1 -b .lastcommit
%patch22 -p1 -b .timefix
%patch24 -p1 -b .nullfix
%patch25 -p1 -b .jpegfix
@@ -802,20 +802,17 @@ udev.
# %%patch96 -p1 -b .flatsetfix
# %%patch97 -p1 -b .arm-init-fix
%patch98 -p1 -b .gcc8-alignof
-%patch99 -p1 -b .crashpad-aarch64-fix
%if 0%{?rhel} == 7
-%patch100 -p1 -b .oldexec
+# %%patch100 -p1 -b .oldexec
%endif
%patch101 -p1 -b .fedora-user-agent
%patch102 -p1 -b .py3fix
%patch103 -p1 -b .py2
-%patch104 -p1 -b .fixb
-%patch105 -p1 -b .cors
-%patch106 -p1 -b .libjpeg
-%patch107 -p1 -b .webp
-%patch108 -p1 -b .move-unique-ptr
+# %%patch108 -p1 -b .move-unique-ptr
%patch109 -p1 -b .aarch64-int64x1_t
%patch110 -p1 -b .fix-default-redeclaration
+%patch111 -p1 -b .wvhack
+%patch112 -p1 -b .sanebuild
# Change shebang in all relevant files in this directory and all subdirectories
@@ -1002,6 +999,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals
%endif
CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_widevine=true'
# CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true'
%if 0%{gtk3}
CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'
@@ -1044,6 +1042,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'net/third_party/quic' \
'net/third_party/spdy' \
'third_party/WebKit' \
+ 'third_party/abseil-cpp' \
'third_party/adobe' \
'third_party/analytics' \
'third_party/angle' \
@@ -1055,6 +1054,9 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/angle/third_party/glslang' \
'third_party/angle/third_party/spirv-headers' \
'third_party/angle/third_party/spirv-tools' \
+ 'third_party/angle/third_party/vulkan-headers' \
+ 'third_party/angle/third_party/vulkan-loader' \
+ 'third_party/angle/third_party/vulkan-tools' \
'third_party/angle/third_party/vulkan-validation-layers' \
'third_party/apple_apsl' \
'third_party/blanketjs' \
@@ -1068,7 +1070,10 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult' \
'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \
'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \
+ 'third_party/catapult/third_party/beautifulsoup4' \
+ 'third_party/catapult/third_party/html5lib-python' \
'third_party/catapult/third_party/polymer' \
+ 'third_party/catapult/third_party/six' \
'third_party/catapult/tracing/third_party/d3' \
'third_party/catapult/tracing/third_party/gl-matrix' \
'third_party/catapult/tracing/third_party/jszip' \
@@ -1169,6 +1174,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/rnnoise' \
'third_party/s2cellid' \
'third_party/sfntly' \
+ 'third_party/simplejson' \
'third_party/sinonjs' \
'third_party/skia' \
'third_party/skia/third_party/gif' \
@@ -1199,6 +1205,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/yasm' \
'third_party/zlib' \
'third_party/zlib/google' \
+ 'tools/gn/base/third_party/icu' \
'url/third_party/mozilla' \
'v8/src/third_party/utf8-decoder' \
'v8/src/third_party/valgrind' \
@@ -1293,7 +1300,7 @@ if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
exit 1 ; \
fi
-tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
+tools/gn/bootstrap/bootstrap.py -v "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
%{target}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
%if %{freeworld}
@@ -1311,9 +1318,6 @@ rm -rf third_party/libusb/src/libusb/libusb.h
cp -a %{_includedir}/libusb-1.0/libusb.h third_party/libusb/src/libusb/libusb.h
%endif
-# make up a version for widevine
-sed '14i#define WIDEVINE_CDM_VERSION_STRING "Something fresh"' -i "third_party/widevine/cdm/stub/widevine_cdm_version.h"
-
# Hard code extra version
FILE=chrome/common/channel_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
@@ -1616,10 +1620,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%dir %{chromium_path}
%{chromium_path}/*.bin
%{chromium_path}/chrome_*.pak
-%{chromium_path}/keyboard_resources.pak
%{chromium_path}/resources.pak
-%{chromium_path}/views_mus_resources.pak
%{chromium_path}/icudtl.dat
+%{chromium_path}/views_mus_resources.pak
%{chromium_path}/%{chromium_browser_channel}
%{chromium_path}/%{chromium_browser_channel}.sh
%{chromium_path}/MEIPreload/
@@ -1713,6 +1716,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%files libs
%exclude %{chromium_path}/libffmpeg.so*
%exclude %{chromium_path}/libmedia.so*
+# %%exclude %%{chromium_path}/libwidevinecdm.so
%{chromium_path}/lib*.so*
%endif
@@ -1761,6 +1765,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Sep 12 2018 Tom Callaway <spot(a)fedoraproject.org> - 69.0.3497.92-1
+- update to 69.0.3497.92
+
+* Wed Sep 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 69.0.3497.81-1
+- update to 69.0.3497.81
+
* Tue Aug 28 2018 Patrik Novotný <panovotn(a)redhat.com> - 68.0.3440.106-4
- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
diff --git a/sources b/sources
index d81fedb..19cd551 100644
--- a/sources
+++ b/sources
@@ -17,3 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
SHA512 (chromium-68.0.3440.106-clean.tar.xz) = a609975c96674f3a84a33bb3d57271535671e11d0775efeceff4f8a965851216038cf491281aaab0cc64c6e99af033f9c8a93f759f232e8c686408dbc09c8dd5
SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
+SHA512 (chromium-69.0.3497.92-clean.tar.xz) = 8cba541684ba3539e888c76e00a27c0f4cbcce9164544768a840002b8c44727d6f0596e288170989331d7693b510ec26cb6fb4b68e530339dfb0685cc9ed4fd8
6 years
