[chromium-freeworld: 8/32] Merge branch 'master' into f26
by Miro Hrončok
commit 699efa46c6c23ba560889330311af324708bfa54
Merge: a2f0a87 41a8870
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Dec 15 09:46:25 2017 +0100
Merge branch 'master' into f26
.gitignore | 1 +
chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch | 12 ++++++++++++
chromium.spec | 17 +++++++++++------
clean_ffmpeg.sh | 8 +++++++-
sources | 2 +-
5 files changed, 32 insertions(+), 8 deletions(-)
---
5 years, 11 months
[chromium-freeworld: 7/32] Merge branch 'master' into f26
by Miro Hrončok
commit a2f0a8717bc466f99041658b026bc257b42f6664
Merge: 6844a76 6af85f9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Dec 12 09:21:11 2017 -0500
Merge branch 'master' into f26
.gitignore | 1 +
chromium-46.0.2490.71-gcc5.patch | 354 ------------
chromium-46.0.2490.86-use_system_opus.patch | 12 -
chromium-48.0.2564.103-gcc6.patch | 204 -------
chromium-50.0.2661.86-addrfix.patch | 11 -
chromium-50.0.2661.94-unbundle-re2-fix.patch | 12 -
...mium-52.0.2723.2-PNGImageDecoder-fix-cast.patch | 12 -
chromium-52.0.2723.2-sync_link_zlib.patch | 11 -
...m-icu-54-does-not-have-detectHostTimeZone.patch | 12 -
chromium-52.0.2723.2-use_system_harfbuzz.patch | 12 -
chromium-52.0.2743.82-arm-icu-fix.patch | 12 -
chromium-52.0.2743.82-cups22.patch | 47 --
chromium-52.0.2743.82-more-codec-aliases.patch | 15 -
chromium-52.0.2743.82-sandbox-pie.patch | 15 -
chromium-53.0.2785.101-crrev-415028.patch | 142 -----
chromium-53.0.2785.92-gn-system.patch | 252 ---------
chromium-53.0.2785.92-last-commit-position.patch | 28 -
chromium-54.0.2840.59-arm-icu-fix.patch | 12 -
chromium-54.0.2840.59-gcc5.patch | 354 ------------
chromium-54.0.2840.59-gn-system.patch | 223 --------
chromium-54.0.2840.59-i686-ld-memory-tricks.patch | 12 -
chromium-54.0.2840.59-nullfix.patch | 35 --
...4.0.2840.90-aura-browser-link-to-snapshot.patch | 11 -
chromium-54.0.2840.90-setopaque.patch | 13 -
chromium-55.0.2883.75-gcc5.patch | 354 ------------
chromium-55.0.2883.75-more-codec-aliases.patch | 15 -
chromium-55.0.2883.75-use_system_harfbuzz.patch | 12 -
chromium-55.0.2883.87-rvalue-fix.patch | 17 -
chromium-56.0.2924.87-gcc7.patch | 82 ---
chromium-58.0.3029.81-enable-mp3.patch | 144 -----
chromium-58.0.3029.81-ffmpeg-stdatomic.patch | 14 -
chromium-58.0.3029.81-fix-gn.patch | 11 -
chromium-58.0.3029.81-use_system_harfbuzz.patch | 12 -
chromium-59.0.3071.86-dma-buf-header-hack.patch | 13 -
chromium-59.0.3071.86-enable-mp3.patch | 477 ----------------
chromium-59.0.3071.86-gcc7.patch | 81 ---
chromium-59.0.3071.86-setopaque.patch | 12 -
chromium-60.0.3112.101-camfix.patch | 25 -
chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch | 12 -
chromium-60.0.3112.78-enable-mp3.patch | 479 ----------------
chromium-60.0.3112.78-fix-gn-bootstrap.patch | 11 -
chromium-60.0.3112.78-gcc7.patch | 80 ---
chromium-60.0.3112.78-gtk2fix.patch | 612 ---------------------
chromium-60.0.3112.90-init-list-hack.patch | 27 -
chromium-61.0.3163.79-MOAR-GCC-FIXES.patch | 35 --
chromium-61.0.3163.79-dde535-gcc-fix.patch | 14 -
...-epel7-no-nullptr-assignment-on-StructPtr.patch | 12 -
chromium-61.0.3163.79-fix-atk-compile.patch | 12 -
chromium-61.0.3163.79-fix-gn-again.patch | 20 -
chromium-61.0.3163.79-gcc-nc.patch | 12 -
chromium-61.0.3163.79-gcc5-r1.patch | 67 ---
chromium-61.0.3163.79-gcc7.patch | 12 -
chromium-61.0.3163.79-gtk2fix.patch | 23 -
chromium-61.0.3163.79-kmaxskip-constexpr.patch | 12 -
chromium-61.0.3163.79-rvalue-fix.patch | 36 --
chromium-61.0.3163.79-uglyhack.patch | 12 -
...patch => chromium-63.0.3289.84-enable-mp3.patch | 184 ++++---
chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch | 12 +
chromium-63.0.3289.84-fix-ft-hb-unbundle.patch | 36 ++
chromium-63.0.3289.84-gcc-round-fix.patch | 11 +
chromium-63.0.3289.84-gcc5-r3.patch | 104 ++++
chromium-63.0.3289.84-nolibc++.patch | 15 +
chromium-63.0.3289.84-nullfix.patch | 43 ++
chromium-63.0.3289.84-setopaque.patch | 12 +
chromium-browser.appdata.xml | 38 --
chromium.spec | 584 ++++----------------
clean_ffmpeg.sh | 4 +
sources | 2 +-
68 files changed, 430 insertions(+), 5184 deletions(-)
---
5 years, 11 months
[chromium-freeworld: 6/32] Merge branch 'master' into f26
by Miro Hrončok
commit 6844a767bb8429a6a2932bf7fb580fc5db033275
Merge: 7745b94 bc9e77b
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Nov 8 12:59:50 2017 -0500
Merge branch 'master' into f26
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
5 years, 11 months
[chromium-freeworld: 5/32] fix merge
by Miro Hrončok
commit 7745b940277628f4441e38459f2b3f8a7550544a
Merge: d02ac4e 7d1b47a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Oct 29 10:38:40 2017 -0400
fix merge
.gitignore | 1 +
chromium.spec | 22 ++++++++++++++++++++--
sources | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
---
5 years, 11 months
[chromium-freeworld: 4/32] Fix the policy templates handling
by Miro Hrončok
commit d02ac4e7be3c27a112f917f3bb3348410dea0862
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Wed Oct 25 10:30:34 2017 +0200
Fix the policy templates handling
Basically revert my previous commits as the policy templates are
generated during the build. The only thing that we were copying out from
the tarballs was the policy templates documentation, but that one is
generated as well so use that one and remove the policy_templates zip
file from sources
chromium-latest.py | 30 ------------------------------
chromium.spec | 6 +-----
sources | 1 -
3 files changed, 1 insertion(+), 36 deletions(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 2efe44b..c77899d 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -209,33 +209,6 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
-def remove_and_download_latest_policy_templates(version_string):
-
- policy_file = 'policy_templates.zip'
- 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.
- 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__':
@@ -321,9 +294,6 @@ if __name__ == '__main__':
download_version(chromium_version)
- # Always download the newest 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)
if (args.clean and os.path.isdir(latest_dir)):
diff --git a/chromium.spec b/chromium.spec
index f9ec65e..53569ec 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -247,7 +247,6 @@ Source7: get_free_ffmpeg_source_files.py
Source8: get_linux_tests_names.py
# GNOME stuff
Source9: chromium-browser.xml
-Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
Source11: chrome-remote-desktop@.service
Source13: master_preferences
@@ -617,7 +616,6 @@ without support for alsa, cups, dbus, gconf, gio, kerberos, pulseaudio, or
udev.
%prep
-%setup -q -T -c -n %{name}-policies -a 10
%setup -q -T -c -n depot_tools -a 2
%if 0%{tests}
%setup -q -n chromium-%{version} -b 1
@@ -1317,10 +1315,8 @@ sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desk
# Add directories for policy management
mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed
mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/recommended
-cp -a ../%{name}-policies/common/html/en-US/*.html .
-# linux json files no longer in .zip file
-#cp -a ../%{name}-policies/linux/examples/*.json .
+cp -a out/Release/gen/chrome/app/policy/common/html/en-US/*.html .
cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json .
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
diff --git a/sources b/sources
index 64106c5..9d1d29d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) = a7e07808a5a053e9e32fe879630ac227369f46e730b6155a570ae096e65e802297a6e635d325886720e55d06ea68ab598bc6b361ede84e61e5e0e577fd4c38fb
SHA512 (chromium-62.0.3202.62-clean.tar.xz) = 5151cdd4cc9f5735984ea16615311dbec759d62496b619fa5a04e06e08821ccba7f11e2d1835e2020edcb783150cc7f1880e62084ae9f69057fabea0459e147b
5 years, 11 months
[chromium-freeworld: 3/32] Merge branch 'master' into f26
by Miro Hrončok
commit c28ea780441f1b559607cc8a5645f21078d41dfa
Merge: 07728cd 3f324a0
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 24 17:02:27 2017 -0400
Merge branch 'master' into f26
...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(-)
---
5 years, 11 months
[chromium-freeworld: 2/32] Improve the chromium-latest.py script
by Miro Hrončok
commit 07728cdf8251f5fab60de9e48e5cee5bb5fc9cf4
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)
5 years, 11 months
[chromium-freeworld: 1/32] Update the chromium-lastest.py to always download the policy templates
by Miro Hrončok
commit 9d223e0ab1fea6a6573805f7bde1ea0c6e538cb6
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)):
5 years, 11 months
[chromium-freeworld] (32 commits) ...Merge Fedora, chromium-66.0.3359.181-2
by Miro Hrončok
Summary of changes:
9d223e0... Update the chromium-lastest.py to always download the polic
07728cd... Improve the chromium-latest.py script
c28ea78... Merge branch 'master' into f26
d02ac4e... Fix the policy templates handling
7745b94... fix merge
6844a76... Merge branch 'master' into f26
a2f0a87... Merge branch 'master' into f26
699efa4... Merge branch 'master' into f26
6fc5f9d... Merge branch 'master' into f26
dee55f8... Merge branch 'master' into f26
cf44702... Merge branch 'f26' of ssh://pkgs.fedoraproject.org/rpms/chr
1795734... Merge branch 'master' into f26
fb49317... Merge branch 'master' into f26
b2a482e... Merge branch 'master' into f26
dcb134e... Merge branch 'master' into f26
752de26... Merge branch 'master' into f26
0996727... Merge branch 'master' into f26
5479a8c... 66.0.3359.139
5afa5c7... Merge branch 'master' into f26
840f0be... fix sources
85fa5c5... missing patch
c380501... Merge branch 'master' into f26
8667898... disable patch47
3f9e662... fix arm build
0f7615a... Merge branch 'master' into f26
55ffd95... 66.0.3359.170
b3bbed0... add swiftshader to files
16a75be... only x86_64 i686 have swiftshader
f953b3f... fix gcc8 alignof issue on i686
7575596... update to 66.0.3359.181
f1f56dc... fix missing files
e69acc6... Merge Fedora, chromium-66.0.3359.181-2
5 years, 11 months