[chromium-freeworld/f27: 9/37] Merge branch 'master' into f27
by hellbanger
commit 15897b3c32017e345d77ca9cf4d172f2f6797f0b
Merge: 7ce9987 dfd304e
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Dec 15 10:14:01 2017 +0100
Merge branch 'master' into f27
chromium.spec | 1 +
1 file changed, 1 insertion(+)
---
6 years, 1 month
[chromium-freeworld/f27: 8/37] Merge branch 'master' into f27
by hellbanger
commit 7ce998772775fb27ab8030d8de8e514a30683b38
Merge: d8bf7f7 41a8870
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Dec 15 09:45:24 2017 +0100
Merge branch 'master' into f27
.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(-)
---
6 years, 1 month
[chromium-freeworld/f27: 7/37] Merge branch 'master' into f27
by hellbanger
commit d8bf7f7b1c0130dc2788962cf7d499d21c0145df
Merge: 58dd4cb 6af85f9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Dec 12 09:20:46 2017 -0500
Merge branch 'master' into f27
.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(-)
---
6 years, 1 month
[chromium-freeworld/f27: 6/37] Merge branch 'master' into f27
by hellbanger
commit 58dd4cbd47fcec7b27bcd4dbd848a36d3e1e84b3
Merge: 7587893 bc9e77b
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Nov 8 12:59:29 2017 -0500
Merge branch 'master' into f27
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
6 years, 1 month
[chromium-freeworld/f27: 5/37] fix merge
by hellbanger
commit 758789302299bacc342189a27ed8606eb33858bc
Merge: 8897747 7d1b47a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Oct 29 10:38:09 2017 -0400
fix merge
.gitignore | 1 +
chromium.spec | 22 ++++++++++++++++++++--
sources | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
---
6 years, 1 month
[chromium-freeworld/f27: 4/37] Fix the policy templates handling
by hellbanger
commit 889774789be354a9771af499e67841bf1d835be4
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
6 years, 1 month
[chromium-freeworld/f27: 3/37] Merge branch 'master' into f27
by hellbanger
commit fb9579dde5c10d46da38356cca5a588a390ac599
Merge: 8b09b7c 3f324a0
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 24 17:00:36 2017 -0400
Merge branch 'master' into f27
...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(-)
---
6 years, 1 month
[chromium-freeworld/f27: 2/37] Improve the chromium-latest.py script
by hellbanger
commit 8b09b7c713e18eb25972f37246cb007c76c46ca7
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)
6 years, 1 month
[chromium-freeworld/f27: 1/37] Update the chromium-lastest.py to always download the policy templates
by hellbanger
commit b1ff0089a4cbcc01cc7c1d175e110c11cd60940a
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)):
6 years, 1 month
[chromium-freeworld/f27] (37 commits) ...Merge Fedora, chromium-69.0.3497.100-1
by hellbanger
Summary of changes:
b1ff008... Update the chromium-lastest.py to always download the polic
8b09b7c... Improve the chromium-latest.py script
fb9579d... Merge branch 'master' into f27
8897747... Fix the policy templates handling
7587893... fix merge
58dd4cb... Merge branch 'master' into f27
d8bf7f7... Merge branch 'master' into f27
7ce9987... Merge branch 'master' into f27
15897b3... Merge branch 'master' into f27
663a6db... Merge branch 'master' into f27
7ccce98... Merge branch 'f27' of ssh://pkgs.fedoraproject.org/rpms/chr
b6faa81... Merge branch 'master' into f27
75a6c7f... Merge branch 'master' into f27
ee0189c... Merge branch 'master' into f27
df426c5... Merge branch 'master' into f27
cae1f49... Merge branch 'master' into f27
e4f98e1... Merge branch 'master' into f27
1b62cfa... Merge branch 'master' into f27
a5e86a6... Merge branch 'master' into f27
083af9c... Merge branch 'master' into f27
a94664f... Merge branch 'master' into f27
0590af5... Merge branch 'master' into f27
33f5ab5... Merge branch 'master' into f27
56425c2... Merge branch 'master' into f27
31c45e8... Merge branch 'master' into f27
5c21f12... Merge branch 'master' into f27
20af375... Merge branch 'master' into f27
8731627... Merge branch 'master' into f27
0653cb2... Merge branch 'master' into f27
cd9828b... Merge branch 'master' into f27
0f0b136... Merge branch 'master' into f27
8159fb8... Merge branch 'master' into f27
e3c17c3... Merge branch 'master' into f27
a913b5c... Also fix shebangs with spaces (*)
a367efa... update to 69.0.3497.100 (*)
4a3f8b5... Merge branch 'master' into f27
4d593ba... Merge Fedora, chromium-69.0.3497.100-1
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month