[chromium-freeworld: 4/15] do not attempt to use std=c++14 on epel7
by Miro Hrončok
commit 7abe45ef20659a9277d79093f4e1d8d96194f779
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 24 22:25:28 2017 -0400
do not attempt to use std=c++14 on epel7
chromium-62.0.3202.62-epel7-noc++14.patch | 12 ++++++++++++
chromium.spec | 11 ++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/chromium-62.0.3202.62-epel7-noc++14.patch b/chromium-62.0.3202.62-epel7-noc++14.patch
new file mode 100644
index 0000000..57d24b0
--- /dev/null
+++ b/chromium-62.0.3202.62-epel7-noc++14.patch
@@ -0,0 +1,12 @@
+diff -up chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py.epel7-noc++14 chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py
+--- chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py.epel7-noc++14 2017-10-24 22:20:25.881183458 -0400
++++ chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py 2017-10-24 22:20:38.395943374 -0400
+@@ -349,7 +349,7 @@ def write_gn_ninja(path, root_gen_dir, o
+ '-pipe',
+ '-fno-exceptions'
+ ])
+- cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++ cflags_cc.extend(['-Wno-c++11-narrowing'])
+ if is_aix:
+ cflags.extend(['-maix64'])
+ ldflags.extend([ '-maix64 -Wl,-bbigtoc' ])
diff --git a/chromium.spec b/chromium.spec
index f9ec65e..b5aec69 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -119,7 +119,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3202.62
-Release: 1%{?dist}
+Release: 1%{?dist}.1
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)
@@ -216,6 +216,8 @@ Patch62: chromium-gcc5-r3.patch
Patch63: chromium-gn-bootstrap-r17.patch
# Fix _cplusplus conditional
Patch64: chromium-62.0.3202.62-correct-cplusplus-check.patch
+# epel7 does not know about c++14
+Patch65: chromium-62.0.3202.62-epel7-noc++14.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -667,6 +669,7 @@ udev.
%patch59 -p1 -b .gcc-nc
%patch60 -p1 -b .nonullptr
%patch61 -p1 -b .another-rvalue-fix
+%patch65 -p1 -b .epel7-noc++14
%endif
%patch50 -p1 -b .pathfix
%patch53 -p1 -b .nogccoptmath
@@ -806,6 +809,9 @@ CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_bin
%ifarch aarch64
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
+%if 0%{?rhel} == 7
+CHROMIUM_CORE_GN_DEFINES+=' use_cxx11=true'
+%endif
export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
@@ -1902,6 +1908,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Tue Oct 24 2017 Tom Callaway <spot(a)fedoraproject.org> 62.0.3202.62-1.1
+- do not attempt std=c++14 on epel7
+
* Wed Oct 18 2017 Tom Callaway <spot(a)fedoraproject.org> 62.0.3202.62-1
- update to 62.0.3202.62
7 years
[chromium-freeworld: 3/15] Merge branch 'master' into epel7
by Miro Hrončok
commit 12bdf54b389cf5395cdccba7e7b85953881f8170
Merge: b36884a 3f324a0
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 24 17:03:05 2017 -0400
Merge branch 'master' into epel7
...mium-62.0.3202.62-correct-cplusplus-check.patch | 20 +
chromium-62.0.3202.62-dde535-gcc-fix.patch | 13 +
chromium-62.0.3202.62-enable-mp3.patch | 484 +++++++++++++++++++++
...-epel7-no-nullptr-assignment-on-StructPtr.patch | 12 +
chromium-62.0.3202.62-gcc-nc.patch | 11 +
chromium-62.0.3202.62-gcc7.patch | 11 +
chromium-62.0.3202.62-kmaxskip-constexpr.patch | 12 +
chromium-62.0.3202.62-rvalue-fix.patch | 45 ++
chromium-gcc5-r3.patch | 98 +++++
chromium-gn-bootstrap-r17.patch | 68 +++
chromium.spec | 146 +++----
sources | 4 +-
12 files changed, 845 insertions(+), 79 deletions(-)
---
7 years
[chromium-freeworld: 2/15] Improve the chromium-latest.py script
by Miro Hrončok
commit b36884aebdb5c98e6ad3c515020919bbccbcda53
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Thu Oct 19 14:08:03 2017 +0200
Improve the chromium-latest.py script
- Download the policy templates per release channel
- Only run the nacl_versions when not running on python 2.6 as the
toolchain_build modules are not python 2.6 compatible
chromium-latest.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 242e8d8..2efe44b 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -165,6 +165,10 @@ def download_version(version):
download_file_and_compare_hashes ('chromium-%s-testdata.tar.xz' % version)
def nacl_versions(version):
+
+ if sys.version_info[0] == 2 and sys.version_info[1] == 6:
+ return
+
myvars = {}
chrome_dir = './chromium-%s' % version
with open(chrome_dir + "/native_client/tools/REVISIONS") as myfile:
@@ -205,10 +209,16 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
-def remove_and_download_latest_policy_templates():
+def remove_and_download_latest_policy_templates(version_string):
policy_file = 'policy_templates.zip'
- path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ if version_string != 'stable':
+ if version_string == 'unstable':
+ policy_file = "dev_" + policy_file
+ else:
+ policy_file = version_string + "_" + policy_file
+
+ path = 'https://dl.google.com/chrome/policy/%s' % policy_file
remove_file_if_exists(policy_file)
# Let's make sure we haven't already downloaded it.
@@ -312,7 +322,7 @@ if __name__ == '__main__':
download_version(chromium_version)
# Always download the newest policy templates
- remove_and_download_latest_policy_templates()
+ remove_and_download_latest_policy_templates(version_string)
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
7 years
[chromium-freeworld: 1/15] Update the chromium-lastest.py to always download the policy templates
by Miro Hrončok
commit 18ab5a523a50798d420829681bb6157d530c3bc4
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Wed Oct 18 13:28:53 2017 +0200
Update the chromium-lastest.py to always download the policy templates
They are changing across the releases - always download the latest one.
chromium-latest.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 88703db..242e8d8 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -42,7 +42,7 @@ chromium_root_dir = "."
version_string = "stable"
name = 'Chromium Latest'
-script_version = 0.8
+script_version = 0.9
my_description = '{0} {1}'.format(name, script_version)
@@ -205,6 +205,26 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
+def remove_and_download_latest_policy_templates():
+
+ policy_file = 'policy_templates.zip'
+ path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ remove_file_if_exists(policy_file)
+
+ # Let's make sure we haven't already downloaded it.
+ if os.path.isfile("./%s" % policy_file):
+ print "%s already exists!" % policy_file
+ else:
+ print "Downloading %s" % path
+ # Perhaps look at using python-progressbar at some point?
+ info=urllib.urlretrieve(path, policy_file, reporthook=dlProgress)[1]
+ urllib.urlcleanup()
+ print ""
+ if (info["Content-Type"] != "application/octet-stream"):
+ print 'Policy templates are not on servers.' % version_string
+ remove_file_if_exists (policy_file)
+ sys.exit(1)
+
# This is where the magic happens
if __name__ == '__main__':
@@ -291,6 +311,9 @@ if __name__ == '__main__':
download_version(chromium_version)
+ # Always download the newest policy templates
+ remove_and_download_latest_policy_templates()
+
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
if (args.clean and os.path.isdir(latest_dir)):
7 years
[chromium-freeworld] (15 commits) ...Merge Fedora, chromium-62.0.3202.89-1
by Miro Hrončok
Summary of changes:
18ab5a5... Update the chromium-lastest.py to always download the polic
b36884a... Improve the chromium-latest.py script
12bdf54... Merge branch 'master' into epel7
7abe45e... do not attempt to use std=c++14 on epel7
2abf30d... Fix the policy templates handling
d8f6aaa... Fix the policy templates handling
530c35b... instead use std=c++11 on epel7
6aefd88... Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/rpms/c
f6767a1... fix decay_t usage for gcc 4.8/c++11
2180bdb... more C++11 type handling (enable_if)
2f12a92... even moar c++11
4b560f7... 62.0.3202.75
7d1b47a... fix merge
bc9e77b... 62.0.3202.89
06edfb5... Merge Fedora, chromium-62.0.3202.89-1
7 years
[nemo-dropbox/f27] update to 3.6.0
by Leigh Scott
Summary of changes:
2510312... update to 3.6.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
