September 2019 - rpmfusion-commits

[chromium-libs-media-freeworld: 96/259] check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on b

by Nicolas Chauvet

commit 6588e7bdd3acbad84209cd63daa4fe7738d2858a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 28 10:01:28 2018 -0400 check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on by default) chromium.spec | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) --- diff --git a/chromium.spec b/chromium.spec index 845e712..4f76103 100644 --- a/chromium.spec +++ b/chromium.spec @@ -6,6 +6,10 @@ %global lsuffix fedora %endif +# Some people wish not to use the Fedora Google API keys. Mmkay. +# Expect stuff to break in weird ways if you disable. +%global useapikeys 1 + # Leave this alone, please. %global target out/Release %global headlesstarget out/Headless @@ -110,10 +114,17 @@ BuildRequires: libicu-devel >= 5.4 ### Note: These are for Fedora use ONLY. ### For your own distribution, please get your own set of keys. ### http://lists.debian.org/debian-legal/2013/11/msg00006.html +%if %{useapikeys} %global api_key AIzaSyDUIXvzVrt5OkVsgXhQ6NFfvWlA44by-aw %global default_client_id 449907151817.apps.googleusercontent.com %global default_client_secret miEreAep8nuvTdvLums6qyLK %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com +%else +%global api_key %nil +%global default_client_id %nil +%global default_client_secret %nil +%global chromoting_client_id %nil +%endif %global majorversion 65 @@ -1130,6 +1141,12 @@ sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"| . /opt/rh/devtoolset-7/enable %endif +# Check that there is no system 'google' module, shadowing bundled ones: +if python -c 'import google ; print google.__path__' 2> /dev/null ; then \ + echo "Python 'google' module is defined, this will shadow modules of this build"; \ + exit 1 ; \ +fi + tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target} @@ -1597,6 +1614,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Mar 28 2018 Tom Callaway <spot(a)fedoraproject.org> +- check that there is no system 'google' module, shadowing bundled ones +- conditionalize api keys (on by default) + * Wed Mar 21 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.181-1 - update to 65.0.3325.181

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 95/259] Merge branch 'master' into f26

by Nicolas Chauvet

commit 752de2696dc47737ec34697b70ef9c0729b5df7f Merge: dcb134e c747d58 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 21 16:45:05 2018 -0400 Merge branch 'master' into f26 .gitignore | 1 + chromium-65.0.3325.162-epel7-stdc++.patch | 12 ++++++++++++ chromium.spec | 32 ++++++++++++++++++++++++++----- sources | 2 +- 4 files changed, 41 insertions(+), 6 deletions(-) ---

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 94/259] 65.0.3325.181

by Nicolas Chauvet

commit c747d58e15b97a4aab04b7cf13ef650d6a2d0e07 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 21 16:43:26 2018 -0400 65.0.3325.181 .gitignore | 1 + chromium.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3e50fe8..ddcd939 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /chromium-64.0.3282.186-clean.tar.xz /chromium-65.0.3325.146-clean.tar.xz /chromium-65.0.3325.162-clean.tar.xz +/chromium-65.0.3325.181-clean.tar.xz diff --git a/chromium.spec b/chromium.spec index 50a10fc..845e712 100644 --- a/chromium.spec +++ b/chromium.spec @@ -122,8 +122,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3325.162 -Release: 3%{?dist} +Version: %{majorversion}.0.3325.181 +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) @@ -1597,6 +1597,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Mar 21 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.181-1 +- update to 65.0.3325.181 + * Mon Mar 19 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-3 - use bundled libdrm on epel7 diff --git a/sources b/sources index d2b2768..17667f6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-65.0.3325.162-clean.tar.xz) = 6f8d2267ca27027a87515e0dfc4aafeb89b2344b994b48c0b7302dd56868e47df46f270c403f7311a2bbacaf5e1eb8b96b31141e9a99080e12321a0d38a618f5 +SHA512 (chromium-65.0.3325.181-clean.tar.xz) = 12a0bb9e367c628c0db80503f6b0570b5ba95fc766c7a782dc7a98290d3b6c13aa5a3f91c4874e98287ca2fafb41af5db34fb951d06594b369baf29c98ed2846

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 93/259] force lstdc++ on epel7

by Nicolas Chauvet

commit 0d818fb687afe6de0cb0c4e6b61d858df37731af Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Mar 20 16:17:37 2018 -0400 force lstdc++ on epel7 chromium-65.0.3325.162-epel7-stdc++.patch | 12 ++++++++++++ chromium.spec | 13 +++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) --- diff --git a/chromium-65.0.3325.162-epel7-stdc++.patch b/chromium-65.0.3325.162-epel7-stdc++.patch new file mode 100644 index 0000000..ee2066b --- /dev/null +++ b/chromium-65.0.3325.162-epel7-stdc++.patch @@ -0,0 +1,12 @@ +diff -up chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 chromium-65.0.3325.162/build/config/posix/BUILD.gn +--- chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 2018-03-20 16:14:42.425926323 -0400 ++++ chromium-65.0.3325.162/build/config/posix/BUILD.gn 2018-03-20 16:15:10.150152245 -0400 +@@ -74,6 +74,8 @@ config("runtime_library") { + "rt", + ] + } ++ } else { ++ libs += [ "stdc++" ] + } + + if (!is_mac && !is_ios && sysroot != "") { diff --git a/chromium.spec b/chromium.spec index fcf87dd..50a10fc 100644 --- a/chromium.spec +++ b/chromium.spec @@ -246,6 +246,8 @@ Patch84: chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.pa Patch85: chromium-65.0.3325.162-boolfix.patch # From Debian Patch86: chromium-65.0.3325.162-skia-aarch64-buildfix.patch +# Use lstdc++ on EPEL7 only +Patch87: chromium-65.0.3325.162-epel7-stdc++.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -720,6 +722,9 @@ udev. %patch84 -p1 -b .fully-declare %patch85 -p1 -b .boolfix %patch86 -p1 -b .aarch64fix +%if 0%{?rhel} == 7 +%patch87 -p1 -b .epel7 +%endif %if 0%{?asan} export CC="clang" @@ -731,11 +736,7 @@ export CXX="g++" export AR="ar" export RANLIB="ranlib" -%if 0%{?rhel} == 7 -# eh. rhel 7 might need this -%else rm -rf buildtools/third_party/libc++/BUILD.gn -%endif %if 0%{?nacl} # prep the nacl tree @@ -846,11 +847,7 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true' CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false' %endif CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false' -%if 0%{?rhel} == 7 -CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=true' -%else CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false' -%endif %ifarch aarch64 CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"' %endif

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 92/259] rhel 7 might need libc++ bundled

by Nicolas Chauvet

commit 6113fdf4e85fc48c6c8d812f4e955b31cb380da1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Mar 20 12:44:57 2018 -0400 rhel 7 might need libc++ bundled chromium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- diff --git a/chromium.spec b/chromium.spec index 53b4163..fcf87dd 100644 --- a/chromium.spec +++ b/chromium.spec @@ -731,8 +731,11 @@ export CXX="g++" export AR="ar" export RANLIB="ranlib" -# NUKE FROM ORBIT +%if 0%{?rhel} == 7 +# eh. rhel 7 might need this +%else rm -rf buildtools/third_party/libc++/BUILD.gn +%endif %if 0%{?nacl} # prep the nacl tree

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 91/259] try use_custom_libcxx=true on epel7

by Nicolas Chauvet

commit f525a513b3edf0be7034a92fa1ae96dcd50705d5 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Mar 20 10:54:37 2018 -0400 try use_custom_libcxx=true on epel7 chromium.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- diff --git a/chromium.spec b/chromium.spec index 9dd3058..53b4163 100644 --- a/chromium.spec +++ b/chromium.spec @@ -842,7 +842,12 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true' %else CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false' %endif -CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false use_custom_libcxx=false' +CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false' +%if 0%{?rhel} == 7 +CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=true' +%else +CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false' +%endif %ifarch aarch64 CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"' %endif

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 90/259] use bundled libdrm on epel7

by Nicolas Chauvet

commit f7e3b54d1f3e091f04765ffc37f4d53179f87d69 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 19 14:18:55 2018 -0400 use bundled libdrm on epel7 chromium.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) --- diff --git a/chromium.spec b/chromium.spec index 047063c..9dd3058 100644 --- a/chromium.spec +++ b/chromium.spec @@ -86,6 +86,7 @@ BuildRequires: libicu-devel >= 5.4 %global bundlelibpng 1 %global bundlelibjpeg 1 %global bundlefreetype 1 +%global bundlelibdrm 1 %else %global bundleharfbuzz 0 %global bundleopus 1 @@ -94,6 +95,7 @@ BuildRequires: libicu-devel >= 5.4 %global bundlelibpng 0 %global bundlelibjpeg 0 %global bundlefreetype 0 +%global bundlelibdrm 0 %endif # Needs at least harfbuzz 1.7.3 now. @@ -121,7 +123,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} Name: chromium%{chromium_channel} %endif Version: %{majorversion}.0.3325.162 -Release: 2%{?dist} +Release: 3%{?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) @@ -292,7 +294,11 @@ BuildRequires: glibc-devel BuildRequires: gperf BuildRequires: libatomic BuildRequires: libcap-devel +%if 0%{?bundlelibdrm} +#nothing +%else BuildRequires: libdrm-devel +%endif BuildRequires: libgcrypt-devel BuildRequires: libudev-devel BuildRequires: libusb-devel @@ -499,7 +505,9 @@ Provides: bundled(icu) = 58.1 Provides: bundled(kitchensink) = 1 Provides: bundled(leveldb) = 1.20 Provides: bundled(libaddressinput) = 0 -Provides: bundled(libdrm) = 2.4.70 +%if 0%{?bundlelibdrm} +Provides: bundled(libdrm) = 2.4.85 +%endif Provides: bundled(libevent) = 1.4.15 Provides: bundled(libjingle) = 9564 %if 0%{?bundlelibjpeg} @@ -1064,7 +1072,10 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \ %else icu \ %endif +%if %{bundlelibdrm} +%else libdrm \ +%endif %if %{bundlelibjpeg} %else libjpeg \ @@ -1581,6 +1592,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Mon Mar 19 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-3 +- use bundled libdrm on epel7 + * Fri Mar 16 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-2 - disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file) (bz1545241)

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 89/259] Merge branch 'master' into f26

by Nicolas Chauvet

commit dcb134e776a5bb593a665ca670d83e97a5235d3e Merge: b2a482e 6d9e418 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 19 10:31:22 2018 -0400 Merge branch 'master' into f26 chromium.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 88/259] use bundled freetype on epel7

by Nicolas Chauvet

commit 6d9e4187928d6252b77fb1ed8d64b4c64d6b81f8 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 19 10:30:17 2018 -0400 use bundled freetype on epel7 chromium.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) --- diff --git a/chromium.spec b/chromium.spec index 4f5e076..047063c 100644 --- a/chromium.spec +++ b/chromium.spec @@ -85,6 +85,7 @@ BuildRequires: libicu-devel >= 5.4 %global bundlelibwebp 1 %global bundlelibpng 1 %global bundlelibjpeg 1 +%global bundlefreetype 1 %else %global bundleharfbuzz 0 %global bundleopus 1 @@ -92,6 +93,7 @@ BuildRequires: libicu-devel >= 5.4 %global bundlelibwebp 0 %global bundlelibpng 0 %global bundlelibjpeg 0 +%global bundlefreetype 0 %endif # Needs at least harfbuzz 1.7.3 now. @@ -119,7 +121,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} Name: chromium%{chromium_channel} %endif Version: %{majorversion}.0.3325.162 -Release: 1%{?dist} +Release: 2%{?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) @@ -332,7 +334,11 @@ BuildRequires: bzip2-devel BuildRequires: dbus-glib-devel BuildRequires: elfutils-libelf-devel BuildRequires: flac-devel +%if 0%{?bundlefreetype} +# nothing +%else BuildRequires: freetype-devel +%endif BuildRequires: hwdata BuildRequires: kernel-headers BuildRequires: libevent-devel @@ -478,6 +484,9 @@ Provides: bundled(fdmlibm) = 5.3 Provides: bundled(ffmpeg) = 3.2git Provides: bundled(fips181) = 2.2.3 Provides: bundled(fontconfig) = 2.11.0 +%if 0%{?bundlefreetype} +Provides: bundled(freetype) = 2.9.3 +%endif Provides: bundled(gperftools) = svn144 %if 0%{?bundleharfbuzz} Provides: bundled(harfbuzz) = 1.4.2 @@ -1043,7 +1052,10 @@ export PATH=$PATH:%{_builddir}/depot_tools build/linux/unbundle/replace_gn_files.py --system-libraries \ flac \ +%if 0%{?bundlefreetype} +%else freetype \ +%endif %if 0%{?bundleharfbuzz} %else harfbuzz-ng \ @@ -1572,6 +1584,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt * Fri Mar 16 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-2 - disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file) (bz1545241) +- use bundled freetype on epel7 * Wed Mar 14 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-1 - update to 65.0.3325.162

4 years, 7 months

1
0
0 / 0

[chromium-libs-media-freeworld: 87/259] Merge branch 'master' into f26

by Nicolas Chauvet

commit b2a482e60178dade50f2316c068605af8dcef2a5 Merge: fb49317 bdba7c7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Mar 16 14:36:15 2018 -0400 Merge branch 'master' into f26 chromium-65.0.3325.162-boolfix.patch | 36 ++++++++++++++++++++++ chromium-65.0.3325.162-skia-aarch64-buildfix.patch | 21 +++++++++++++ chromium-browser.desktop | 1 - chromium.spec | 26 +++++++++++++++- 4 files changed, 82 insertions(+), 2 deletions(-) ---

4 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2019